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-22 15:25:26 -07:00
2012-05-07 09:03:39 -07:00
2011-12-08 09:38:53 -08:00
2012-05-01 21:33:35 -07:00
2012-05-07 09:03:39 -07:00
2011-11-26 19:46:48 -08:00
2011-10-18 13:51:34 -07:00
2012-04-18 13:57:26 -07:00
2011-03-31 11:26:23 -03:00
2012-02-13 14:32:34 -08:00
2011-03-31 11:26:23 -03:00
2012-05-01 13:36:18 -04:00
2012-04-18 13:43:30 -07:00
2011-09-18 01:39:36 -07:00
2012-05-01 21:33:37 -07:00
2011-11-18 10:51:00 -08:00
2012-05-01 13:36:18 -04:00
2011-09-18 01:39:36 -07:00
2012-04-27 11:24:43 -07:00
2011-11-18 10:51:00 -08:00
2012-04-27 11:24:44 -07:00
2011-11-18 10:51:00 -08:00
2012-04-27 11:24:45 -07:00