Greg Kroah-Hartman 61906313bd Merge 3.4-rc6 into usb-next
This resolves the conflict with:
	drivers/usb/host/ehci-tegra.c

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2012-05-07 09:03:39 -07:00
..
2011-09-26 15:51:08 -07:00
2012-04-29 22:29:57 -04:00
2012-04-29 22:20:03 -04:00
2012-05-01 21:33:35 -07:00
2012-04-29 22:29:57 -04:00
2012-04-29 22:20:03 -04:00
2012-05-01 13:22:13 -04:00
2012-04-29 22:20:03 -04:00