Subject: linux-next: manual merge of the usb tree

From: Stephen Rothwell <[email-masked]>
Date: Mon, 10 Nov 2008 12:06:20 +1100

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/net/usb/hso.c between commit
939a9516416ad8ccec27aa05bd19236c550c0c03 ("[netdrvr] usb/hso: Cleanup
rfkill error handling") from the net-current tree and commit
d0797ae05df8297aa1db7216c8814419047d5a12 ("HSO: put linefeeds on printk's
in hso.c") from the usb tree.

Some of the changes from the latter have been done on the former and the
former added some code next to those changes.  I have fixed it up for now
but the net-current change will (presumably) be in Linus' tree shortly,
so I expect this to be fixed in the usb tree soon.
-- 
Cheers,
Stephen Rothwell                    [email-masked]
http://www.canb.auug.org.au/~sfr/