Merge 3.7-rc6 into usb-next.
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Nov 2012 02:46:21 +0000 (18:46 -0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Sat, 17 Nov 2012 02:46:21 +0000 (18:46 -0800)
commit0c864d8b3e51bd61f43484268c9aa4eb9a199b02
treede9fa5c3792c84fa173e6d27c856bde0254f7eeb
parent4fd24483d1de7a3c183fa862fa9ff13b49361966
parentf4a75d2eb7b1e2206094b901be09adb31ba63681
Merge 3.7-rc6 into usb-next.

This resolves a conflict with these files:
drivers/usb/early/ehci-dbgp.c
drivers/usb/host/ehci-ls1x.c
drivers/usb/host/ohci-xls.c
drivers/usb/musb/ux500.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/core/hcd.c
drivers/usb/musb/musb_gadget.c
drivers/usb/serial/keyspan.c
drivers/usb/serial/option.c
drivers/usb/serial/usb_wwan.c