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

29 KiB

Raw Blame History

View Raw