diff options
author | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 14:28:46 +0300 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2018-04-05 14:28:46 +0300 |
commit | e2d39e0f95cb414b1fb6530f8429ad411586922b (patch) | |
tree | 58ebf7762babc6fd8fd443fde9002cc7aa89202f /Documentation | |
parent | 108ff0e8012ae10708168940c7474318fb343751 (diff) | |
parent | 2ddc8e2d2b5902b376fee51585c8eed72b8836e7 (diff) | |
download | linux-e2d39e0f95cb414b1fb6530f8429ad411586922b.tar.xz |
Merge branch 'for-4.17/upstream' into for-linus
Pull a few small generic code cleanups.
Diffstat (limited to 'Documentation')
-rw-r--r-- | Documentation/admin-guide/kernel-parameters.txt | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/Documentation/admin-guide/kernel-parameters.txt b/Documentation/admin-guide/kernel-parameters.txt index b98048b56ada..e0d825206681 100644 --- a/Documentation/admin-guide/kernel-parameters.txt +++ b/Documentation/admin-guide/kernel-parameters.txt @@ -4352,6 +4352,9 @@ usbhid.jspoll= [USBHID] The interval which joysticks are to be polled at. + usbhid.kbpoll= + [USBHID] The interval which keyboards are to be polled at. + usb-storage.delay_use= [UMS] The delay in seconds before a new device is scanned for Logical Units (default 1). |