Greg Kroah-Hartman b903bd69e3 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>

2012-07-16 13:16:09 -07:00

24 KiB

Raw Blame History

View Raw