Subject: linux-next: manual merge of the boot-params tree

From: Stephen Rothwell <[email-masked]>
Date: Tue, 30 Dec 2008 01:10:55 +1100

Hi Rusty,

Today's linux-next merge of the boot-params tree got a conflict in
drivers/usb/core/usb.c between commit
6e7b5429a08fe4f71c336710bd45acdce6cd3df7 ("USB: don't use
__module_param_call") from the usb tree and commit
9634765245cd7aba71328c71813ca882d008632d ("USB: Don't use
__module_param_call; use core_param") from the boot-params tree.

Two different versions of the same change?  I fixed it up (used the
boot-params tree version) and can carry the fix as necessary.  It sounds
like Greg should drop the patch from the usb tree (or pick up the version
from the boot-params tree).
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/