Merge 3.10-rc3 into usb-next

We want these fixes.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --cc drivers/usb/chipidea/ci13xxx_imx.c
Simple merge

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

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

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

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

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

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

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

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

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

diff --cc drivers/usb/host/uhci-platform.c
Simple merge

diff --cc drivers/usb/phy/phy-nop.c
Simple merge