diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-09 17:05:53 -0500 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-11-09 17:05:53 -0500 |
| commit | b9427910d2f7fae717dc780fd7bde58e6a475c61 (patch) | |
| tree | aaff4a570e16bf8db2bd5c5c686659fa1582eda3 /Documentation | |
| parent | fe606dffea01481af4bb440ac2717da901383369 (diff) | |
| parent | 1910195423e7bea4c01c42bfe3f81792a6e969bb (diff) | |
Merge tag 'usb-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb
Pull USB fixes from Greg KH:
"Here are some USB fixes for 3.18-rc4.
Just a bunch of little fixes resolving reported issues and new device
ids for existing drivers. Full details are in the shortlog"
* tag 'usb-3.18-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb: (26 commits)
USB: Update default usb-storage delay_use value in kernel-parameters.txt
USB: cdc-acm: add quirk for control-line state requests
phy: omap-usb2: Enable runtime PM of omap-usb2 phy properly
USB: storage: Fix timeout in usb_stor_euscsi_init() and usb_stor_huawei_e220_init()
USB: cdc-acm: only raise DTR on transitions from B0
Revert "storage: Replace magic number with define in usb_stor_euscsi_init()"
usb: core: notify disconnection when core detects disconnect
usb: core: need to call usb_phy_notify_connect after device setup
uas: Add US_FL_NO_ATA_1X quirk for 2 more Seagate models
xhci: no switching back on non-ULT Haswell
USB: quirks: enable device-qualifier quirk for yet another Elan touchscreen
USB: quirks: enable device-qualifier quirk for another Elan touchscreen
MAINTAINERS: Remove duplicate entry for usbip driver
usb: storage: fix build warnings !CONFIG_PM
usb: Remove references to non-existent PLAT_S5P symbol
uas: Add NO_ATA_1X for VIA VL711 devices
xhci: Disable streams on Asmedia 1042 xhci controllers
USB: HWA: fix a warning message
uas: Add US_FL_NO_ATA_1X quirk for 1 more Seagate model
usb-storage: handle a skipped data phase
...
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 4c81a860cc2b..479f33204a37 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -3621,7 +3621,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
| 3621 | 3621 | ||
| 3622 | usb-storage.delay_use= | 3622 | usb-storage.delay_use= |
| 3623 | [UMS] The delay in seconds before a new device is | 3623 | [UMS] The delay in seconds before a new device is |
| 3624 | scanned for Logical Units (default 5). | 3624 | scanned for Logical Units (default 1). |
| 3625 | 3625 | ||
| 3626 | usb-storage.quirks= | 3626 | usb-storage.quirks= |
| 3627 | [UMS] A list of quirks entries to supplement or | 3627 | [UMS] A list of quirks entries to supplement or |