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)
commit47b649590dbbea182f854d6470ee1cd59b7b7684
treea2de3610f9c5e963234cffb35b9d559aab62e164
parent3af5154a869bc278a829bb03e65a709480e821b0
parentcaca6a03d365883564885f2c1da3e88dcf65d139
Merge 3.2-rc3 into usb-linus

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>
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