mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-13 20:16:26 +00:00
Code Issues Releases Wiki Activity
linux-stable/drivers/usb/storage
History
Greg Kroah-Hartman ff4b8a57f0 Merge branch 'driver-core-next' into Linux 3.2 
This resolves the conflict in the arch/arm/mach-s3c64xx/s3c6400.c file,
and it fixes the build error in the arch/x86/kernel/microcode_core.c
file, that the merge did not catch.

The microcode_core.c patch was provided by Stephen Rothwell
<sfr@canb.auug.org.au> who was invaluable in the merge issues involved
with the large sysdev removal process in the driver-core tree.

Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
2012-01-06 11:42:52 -08:00
..
alauda.c USB: convert drivers/usb/* to use module_usb_driver() 2011-11-18 09:34:02 -08:00
cypress_atacb.c USB: convert drivers/usb/* to use module_usb_driver() 2011-11-18 09:34:02 -08:00
datafab.c USB: convert drivers/usb/* to use module_usb_driver() 2011-11-18 09:34:02 -08:00
debug.c
debug.h
ene_ub6250.c Merge branch 'driver-core-next' into Linux 3.2 2012-01-06 11:42:52 -08:00
freecom.c USB: convert drivers/usb/* to use module_usb_driver() 2011-11-18 09:34:02 -08:00
initializers.c
initializers.h
isd200.c USB: convert drivers/usb/* to use module_usb_driver() 2011-11-18 09:34:02 -08:00
jumpshot.c USB: convert drivers/usb/* to use module_usb_driver() 2011-11-18 09:34:02 -08:00
karma.c USB: convert drivers/usb/* to use module_usb_driver() 2011-11-18 09:34:02 -08:00
Kconfig usb-storage: fix realtek cr configuration 2011-09-18 01:33:07 -07:00
libusual.c
Makefile Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-03-16 15:19:35 -07:00
onetouch.c USB: convert drivers/usb/* to use module_usb_driver() 2011-11-18 09:34:02 -08:00
option_ms.c usb: Add module.h to drivers/usb consumers who really use it. 2011-10-31 19:31:25 -04:00
option_ms.h
protocol.c usb-storage: Accept 8020i-protocol commands longer than 12 bytes 2011-11-14 17:05:03 -08:00
protocol.h
realtek_cr.c USB: convert drivers/usb/* to use module_usb_driver() 2011-11-18 09:34:02 -08:00
scsiglue.c Fix common misspellings 2011-03-31 11:26:23 -03:00
scsiglue.h
sddr09.c USB: convert drivers/usb/* to use module_usb_driver() 2011-11-18 09:34:02 -08:00
sddr55.c USB: convert drivers/usb/* to use module_usb_driver() 2011-11-18 09:34:02 -08:00
shuttle_usbat.c USB: convert drivers/usb/* to use module_usb_driver() 2011-11-18 09:34:02 -08:00
sierra_ms.c usb: Add module.h to drivers/usb consumers who really use it. 2011-10-31 19:31:25 -04:00
sierra_ms.h
transport.c usb: Add export.h for EXPORT_SYMBOL/THIS_MODULE where needed 2011-10-31 19:31:25 -04:00
transport.h
uas.c USB: convert drivers/usb/* to use module_usb_driver() 2011-11-18 09:34:02 -08:00
unusual_alauda.h USB: storage: Use USB_ prefix instead of US_ prefix 2010-10-22 10:21:49 -07:00
unusual_cypress.h USB: usb-storage: unusual_devs update for Cypress ATACB 2011-01-22 18:31:26 -08:00
unusual_datafab.h USB: storage: Use USB_ prefix instead of US_ prefix 2010-10-22 10:21:49 -07:00
unusual_devs.h USB: usb-storage: unusual_devs entry for Kingston DT 101 G2 2011-11-26 19:56:47 -08:00
unusual_ene_ub6250.h Staging: Merge ENE UB6250 SD card codes from keucr to drivers/usb/storage 2011-03-07 13:40:59 -08:00
unusual_freecom.h USB: storage: Use USB_ prefix instead of US_ prefix 2010-10-22 10:21:49 -07:00
unusual_isd200.h USB: storage: Use USB_ prefix instead of US_ prefix 2010-10-22 10:21:49 -07:00
unusual_jumpshot.h USB: storage: Use USB_ prefix instead of US_ prefix 2010-10-22 10:21:49 -07:00
unusual_karma.h USB: storage: Use USB_ prefix instead of US_ prefix 2010-10-22 10:21:49 -07:00
unusual_onetouch.h USB: storage: Use USB_ prefix instead of US_ prefix 2010-10-22 10:21:49 -07:00
unusual_realtek.h usb-storage: fix up the unusual_realtek device list 2011-05-17 11:56:28 -07:00
unusual_sddr09.h USB: storage: Use USB_ prefix instead of US_ prefix 2010-10-22 10:21:49 -07:00
unusual_sddr55.h USB: storage: Use USB_ prefix instead of US_ prefix 2010-10-22 10:21:49 -07:00
unusual_usbat.h USB: storage: Use USB_ prefix instead of US_ prefix 2010-10-22 10:21:49 -07:00
usb.c usb_storage: Don't freeze in usb-stor-scan 2011-08-22 15:21:15 -07:00
usb.h usb-storage: redo incorrect reads 2011-06-07 09:05:42 -07:00
usual-tables.c Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging-2.6 2011-03-16 15:19:35 -07:00