2
0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-26 22:24:09 +08:00
linux-next/drivers/usb/storage
Greg Kroah-Hartman 69b7290e51 Merge 3.18-rc4 into usb-next.
This resolves a conflict in drivers/usb/host/Kconfig

Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
2014-11-10 12:10:24 +09:00
..
alauda.c USB: storage: use %*ph specifier to dump small buffers 2014-09-23 22:15:18 -07:00
cypress_atacb.c usb-storage: CY7C68300A chips do not support Cypress ATACB 2013-04-23 10:08:13 -07:00
datafab.c usb: storage: Convert US_DEBUGP to usb_stor_dbg 2013-04-19 11:46:50 -07:00
debug.c usb: storage: Convert usb_stor_dbg to return void 2014-11-03 15:38:17 -08:00
debug.h usb: storage: Convert usb_stor_dbg to return void 2014-11-03 15:38:17 -08:00
ene_ub6250.c staging: keucr: remove driver 2014-07-23 19:01:36 -07:00
freecom.c usb: storage: Convert US_DEBUGP to usb_stor_dbg 2013-04-19 11:46:50 -07:00
initializers.c USB: storage: Fix timeout in usb_stor_euscsi_init() and usb_stor_huawei_e220_init() 2014-11-05 11:45:58 -08:00
initializers.h USB: storage: fix Huawei mode switching regression 2013-03-07 12:23:17 +08:00
isd200.c usb: storage: Convert US_DEBUGP to usb_stor_dbg 2013-04-19 11:46:50 -07:00
jumpshot.c usb: storage: Convert US_DEBUGP to usb_stor_dbg 2013-04-19 11:46:50 -07:00
karma.c usb: storage: Convert US_DEBUGP to usb_stor_dbg 2013-04-19 11:46:50 -07:00
Kconfig SCSI misc on 20140806 2014-08-06 20:10:32 -07:00
Makefile
onetouch.c usb: delete non-required instances of include <linux/init.h> 2014-01-08 15:01:39 -08:00
option_ms.c usb: storage: Convert US_DEBUGP to usb_stor_dbg 2013-04-19 11:46:50 -07:00
option_ms.h
protocol.c USB: storage: fix compile warning 2013-12-09 23:45:39 -08:00
protocol.h
realtek_cr.c usb: storage: fix build warnings !CONFIG_PM 2014-11-03 15:26:16 -08:00
scsiglue.c usb: Fixed a few typos 2014-09-23 22:15:18 -07:00
scsiglue.h
sddr09.c USB: storage: use %*ph specifier to dump small buffers 2014-09-23 22:15:18 -07:00
sddr55.c usb: storage: Convert US_DEBUGP to usb_stor_dbg 2013-04-19 11:46:50 -07:00
shuttle_usbat.c usb: storage: shuttle_usbat: fix discs being detected twice 2014-05-03 18:04:28 -04:00
sierra_ms.c usb: storage: Convert US_DEBUGP to usb_stor_dbg 2013-04-19 11:46:50 -07:00
sierra_ms.h
transport.c Merge 3.18-rc4 into usb-next. 2014-11-10 12:10:24 +09:00
transport.h
uas-detect.h uas: Add missing le16_to_cpu calls to asm1051 / asm1053 usb-id check 2014-09-11 14:21:43 -07:00
uas.c uas: Make uas work with blk-mq 2014-11-03 15:34:00 -08:00
unusual_alauda.h
unusual_cypress.h usb-storage: restrict bcdDevice range for Super Top in Cypress ATACB 2014-02-04 12:59:14 -08:00
unusual_datafab.h
unusual_devs.h storage: Add quirk for another SCM-based USB-SCSI converter 2014-09-23 22:29:27 -07:00
unusual_ene_ub6250.h
unusual_freecom.h
unusual_isd200.h
unusual_jumpshot.h
unusual_karma.h
unusual_onetouch.h
unusual_realtek.h
unusual_sddr09.h
unusual_sddr55.h
unusual_uas.h uas: Add US_FL_NO_ATA_1X quirk for 2 more Seagate models 2014-11-03 15:48:45 -08:00
unusual_usbat.h
usb.c USB patches for 3.18-rc1 2014-10-08 06:47:31 -04:00
usb.h usb-storage: Modify and export adjust_quirks so that it can be used by uas 2014-03-04 15:38:17 -08:00
usual-tables.c USB: storage: Define a new macro for USB storage match rules 2013-02-04 10:40:16 -08:00