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
..
2012-05-15 16:27:08 -07:00
2012-05-15 16:27:11 -07:00
2012-04-20 16:53:58 -07:00
2012-06-26 16:14:34 -07:00
2012-05-15 16:27:17 -07:00
2011-03-31 11:26:23 -03:00
2010-05-20 13:21:47 -07:00
2012-05-15 16:27:20 -07:00
2012-05-15 16:27:23 -07:00
2012-05-15 16:27:25 -07:00
2012-07-16 13:16:09 -07:00
2011-11-15 10:06:15 -08:00
2012-05-15 16:27:30 -07:00
2010-05-20 13:21:47 -07:00