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
..
2012-04-05 22:13:39 -07:00
2012-02-07 15:54:02 -08:00
2012-04-08 14:27:08 +00:00
2012-03-27 16:27:28 -07:00
2012-03-29 18:02:10 -07:00
2012-03-28 18:30:03 +01:00
2012-04-08 14:27:09 +00:00
2012-04-08 14:27:09 +00:00
2012-01-28 20:50:11 +00:00
2012-01-28 20:50:11 +00:00
2012-03-28 18:30:03 +01:00
2012-03-28 18:30:03 +01:00
2012-03-28 18:30:03 +01:00
2012-02-15 04:31:21 +00:00
2012-03-27 16:03:32 -07:00
2012-01-22 14:50:02 +01:00
2012-02-15 04:31:21 +00:00
2012-03-28 18:30:03 +01:00
2012-03-28 18:30:03 +01:00
2012-04-25 12:37:49 -07:00