Greg Kroah-Hartman 2af10844eb USB: Merge 2.6.37-rc5 into usb-next ...

This is to resolve the conflict in the file,
drivers/usb/gadget/composite.c that was due to a revert in Linus's tree
needed for the 2.6.37 release.

Reported-by: Stephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>

2010-12-22 12:25:34 -08:00

35 KiB

Raw Blame History

View Raw