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>

diff --cc drivers/usb/gadget/Kconfig
Simple merge

diff --cc drivers/usb/host/ehci-xls.c
Simple merge

diff --cc drivers/usb/host/ohci-hcd.c
Simple merge

diff --cc drivers/usb/host/ohci-pci.c
Simple merge

diff --cc drivers/usb/host/ohci.h
Simple merge

diff --cc drivers/usb/host/xhci-ring.c
Simple merge

diff --cc drivers/usb/musb/musb_core.c
Simple merge

diff --cc drivers/usb/serial/pl2303.c
Simple merge

diff --cc drivers/usb/storage/ene_ub6250.c
Simple merge