summaryrefslogtreecommitdiffstats
path: root/drivers/usb/storage
diff options
context:
space:
mode:
authorGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-23 21:49:37 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2015-03-23 21:49:37 +0100
commitcd0e075784f4bce97b4ed47d4b354f045e895546 (patch)
tree2354d4c2f5185c59dc21c537841b55c694cc53ec /drivers/usb/storage
parent32fc9eb5b2dcebefb7fb4c8288c739c320362524 (diff)
parentbc465aa9d045feb0e13b4a8f32cc33c1943f62d6 (diff)
downloadblackbird-op-linux-cd0e075784f4bce97b4ed47d4b354f045e895546.tar.gz
blackbird-op-linux-cd0e075784f4bce97b4ed47d4b354f045e895546.zip
Merge 4.0-rc5 into usb-next
We want the USB fixes in here as well to resolve merge conflicts. Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/usb/storage')
-rw-r--r--drivers/usb/storage/unusual_uas.h7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/storage/unusual_uas.h b/drivers/usb/storage/unusual_uas.h
index 82570425fdfe..c85ea530085f 100644
--- a/drivers/usb/storage/unusual_uas.h
+++ b/drivers/usb/storage/unusual_uas.h
@@ -113,6 +113,13 @@ UNUSUAL_DEV(0x0bc2, 0xab2a, 0x0000, 0x9999,
USB_SC_DEVICE, USB_PR_DEVICE, NULL,
US_FL_NO_ATA_1X),
+/* Reported-by: Benjamin Tissoires <benjamin.tissoires@redhat.com> */
+UNUSUAL_DEV(0x13fd, 0x3940, 0x0000, 0x9999,
+ "Initio Corporation",
+ "",
+ USB_SC_DEVICE, USB_PR_DEVICE, NULL,
+ US_FL_NO_ATA_1X),
+
/* Reported-by: Tom Arild Naess <tanaess@gmail.com> */
UNUSUAL_DEV(0x152d, 0x0539, 0x0000, 0x9999,
"JMicron",
OpenPOWER on IntegriCloud