diff options
| author | Mark Brown <broonie@kernel.org> | 2015-01-28 17:04:53 +0000 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-01-28 17:04:53 +0000 |
| commit | e80ce3a0c501b016a3894b54c085ba2cb5d2199e (patch) | |
| tree | 09de4ba75a029b61b61dbe99ea6429d4a8a751bd /Documentation | |
| parent | d0be45d365471f0cd3b9aef8613507bc764979b6 (diff) | |
| parent | 9347e87f7cd66d6ca96ba7d0b4b1cacebea4d096 (diff) | |
Merge branch 'linux-linaro-lsk-v3.14' into linux-linaro-lsk-v3.14-android
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] |