diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-28 17:04:13 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-28 17:04:13 +0000 |
| commit | 9347e87f7cd66d6ca96ba7d0b4b1cacebea4d096 (patch) | |
| tree | 6b857b653819eac7bce7ab2283b33add4fc444e2 /Documentation | |
| parent | 250e8659c56d94320b877f659be45b8de130fa31 (diff) | |
| parent | 4d7313cd7cbe56ccb511eca23ef5bba7f10ffcb8 (diff) | |
Merge tag 'v3.14.30' into linux-linaro-lsk-v3.14
This is the 3.14.30 stable release
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/kernel-parameters.txt | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/Documentation/kernel-parameters.txt b/Documentation/kernel-parameters.txt index 7116fda7077f..5d91ba1606bb 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt @@ -1172,6 +1172,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. i8042.notimeout [HW] Ignore timeout condition signalled by controller i8042.reset [HW] Reset the controller during init and cleanup i8042.unlock [HW] Unlock (ignore) the keylock + i8042.kbdreset [HW] Reset device connected to KBD port i810= [HW,DRM] |