Greg Kroah-Hartman 6ed962a208 Merge 3.1-rc4 into usb-next
This was done to resolve a conflict in this file:
	drivers/usb/host/xhci-ring.c

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2011-08-29 08:56:17 -07:00
..
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2011-08-29 08:56:17 -07:00
2011-07-26 16:49:47 -07:00
2010-03-02 14:54:16 -08:00
2011-03-31 11:26:23 -03:00
2011-03-31 11:26:23 -03:00
2010-05-20 13:21:47 -07:00
2011-08-22 15:21:16 -07:00
2011-08-26 11:27:50 -07:00
2010-05-20 13:21:47 -07:00
2010-05-20 13:21:32 -07:00