Merge 3.2-rc3 into usb-linus
authorGreg Kroah-Hartman <gregkh@suse.de>
Sun, 27 Nov 2011 03:46:19 +0000 (19:46 -0800)
committerGreg Kroah-Hartman <gregkh@suse.de>
Sun, 27 Nov 2011 03:46:48 +0000 (19:46 -0800)
This pulls in the latest USB bugfixes and helps a few of the drivers
merge nicer in the future due to changes in both branches.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
1  2 
drivers/usb/gadget/Kconfig
drivers/usb/host/ehci-xls.c
drivers/usb/host/ohci-hcd.c
drivers/usb/host/ohci-pci.c
drivers/usb/host/ohci.h
drivers/usb/host/xhci-ring.c
drivers/usb/musb/musb_core.c
drivers/usb/serial/pl2303.c
drivers/usb/storage/ene_ub6250.c

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