Merge 2.6.38-rc5 into usb-next
authorGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 17:56:40 +0000 (09:56 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Thu, 17 Feb 2011 17:56:55 +0000 (09:56 -0800)
This is needed to resolve some merge conflicts that were found
in the USB host controller patches, and reported by Stephen Rothwell.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1  2 
drivers/usb/core/hcd.c
drivers/usb/gadget/Kconfig
drivers/usb/host/ehci-hub.c
drivers/usb/musb/musb_host.c
drivers/usb/serial/ftdi_sio.c
include/linux/usb/hcd.h

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge