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-05-03 17:16:52 -07:00
2012-05-07 09:03:39 -07:00
2012-04-20 11:31:00 -07:00
2012-04-12 15:36:33 -07:00
2012-03-27 16:03:32 -07:00
2012-04-27 10:46:45 +08:00
2012-05-01 21:32:55 -07:00
2012-05-07 09:03:39 -07:00
2012-04-12 15:36:33 -07:00
2012-05-07 09:03:39 -07:00
2012-03-30 00:09:17 -07:00
2012-05-07 09:03:39 -07:00
2012-05-02 13:47:49 -07:00
2012-05-07 09:03:39 -07:00
2012-04-18 13:15:51 -07:00
2012-05-07 09:03:39 -07:00