linux/drivers/usb/storage
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
..
alauda.c
cypress_atacb.c
datafab.c
debug.c
debug.h
freecom.c
initializers.c
initializers.h
isd200.c
jumpshot.c
karma.c
Kconfig
libusual.c
Makefile
onetouch.c
option_ms.c
option_ms.h
protocol.c
protocol.h
scsiglue.c
scsiglue.h
sddr09.c
sddr55.c
shuttle_usbat.c
sierra_ms.c
sierra_ms.h
transport.c
transport.h
uas.c Merge branch 'usb-next' into musb-merge 2010-12-16 10:05:06 -08:00
unusual_alauda.h
unusual_cypress.h
unusual_datafab.h
unusual_devs.h USB: usb-storage: unusual_devs entry for the Samsung YP-CP3 2010-12-16 15:45:45 -08:00
unusual_freecom.h
unusual_isd200.h
unusual_jumpshot.h
unusual_karma.h
unusual_onetouch.h
unusual_sddr09.h
unusual_sddr55.h
unusual_usbat.h
usb.c
usb.h
usual-tables.c