diff options
| author | David S. Miller <davem@davemloft.net> | 2015-01-27 19:59:56 -0500 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-01-27 19:59:56 -0500 |
| commit | 95f873f2fff96c592c5d863e2a39825bd8bf0500 (patch) | |
| tree | 0d2dd664964ba2c701aefea5b4d1e85b481045e1 /Documentation/kernel-parameters.txt | |
| parent | 8ea65f4a2dfaaf494ef42a16cbf2fea39b07450f (diff) | |
| parent | 59343cd7c4809cf7598789e1cd14563780ae4239 (diff) | |
Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net
Conflicts:
arch/arm/boot/dts/imx6sx-sdb.dts
net/sched/cls_bpf.c
Two simple sets of overlapping changes.
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'Documentation/kernel-parameters.txt')
| -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 cdb815e833b5..2089c051f23f 100644 --- a/Documentation/kernel-parameters.txt +++ b/Documentation/kernel-parameters.txt | |||
| @@ -1277,6 +1277,7 @@ bytes respectively. Such letter suffixes can also be entirely omitted. | |||
| 1277 | i8042.notimeout [HW] Ignore timeout condition signalled by controller | 1277 | i8042.notimeout [HW] Ignore timeout condition signalled by controller |
| 1278 | i8042.reset [HW] Reset the controller during init and cleanup | 1278 | i8042.reset [HW] Reset the controller during init and cleanup |
| 1279 | i8042.unlock [HW] Unlock (ignore) the keylock | 1279 | i8042.unlock [HW] Unlock (ignore) the keylock |
| 1280 | i8042.kbdreset [HW] Reset device connected to KBD port | ||
| 1280 | 1281 | ||
| 1281 | i810= [HW,DRM] | 1282 | i810= [HW,DRM] |
| 1282 | 1283 | ||