Merge 3.5-rc7 into usb-next
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2012 20:16:09 +0000 (13:16 -0700)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Mon, 16 Jul 2012 20:16:09 +0000 (13:16 -0700)
commitb903bd69e3fa156598def8d6433dfe5352af8da3
treea13380f31bab62acfd667910656525c09511cb8a
parent84a1caf1453c3d44050bd22db958af4a7f99315c
parent1a49e2ac9651df7349867a5cf44e2c83de1046af
Merge 3.5-rc7 into usb-next

This resolves the merge issue with the drivers/usb/host/ehci-omap.c
file.

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/usb/class/cdc-wdm.c
drivers/usb/core/hub.c
drivers/usb/serial/option.c