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-25 12:37:47 -07:00
2012-04-01 23:32:35 -04:00
2012-03-20 11:24:39 -07:00
2012-04-25 12:37:48 -07:00
2012-04-25 12:37:48 -07:00
2012-04-25 12:37:49 -07:00
2009-05-01 15:27:02 -07:00