linux-next: manual merge of the usb tree with Linus' tree

[Stephen Rothwell]

Hi Greg,

Today's linux-next merge of the usb tree got a conflict in
drivers/usb/musb/blackfin.c drivers/usb/musb/musb_core.c
drivers/usb/musb/musb_core.h between commit
1e393c6eece048052d4131ec4dad3b98e35a98e2 ("USB: musb: blackfin: pm: make
it work") from Linus' tree (v2.6.37-rc2) and various commits from the usb
tree.

It was not immediately obvious how to fix these up, so I just used the
versions from the usb tree.  This may not be correct and it would be good
if this was fixed properly in the usb tree.
-- 
Cheers,
Stephen Rothwell                    sfr@xxxxxxxxxxxxxxxx
http://www.canb.auug.org.au/~sfr/

Attachment: pgp00000.pgp
Description: PGP signature