diff options
author | Ingo Molnar | 2017-09-04 11:01:18 +0200 |
---|---|---|
committer | Ingo Molnar | 2017-09-04 11:01:18 +0200 |
commit | edc2988c548db05e33b921fed15821010bc74895 (patch) | |
tree | b35860428acea35e5866d4cf007519ed943a85de /Documentation/input | |
parent | locking/lockdep/selftests: Fix mixed read-write ABBA tests (diff) | |
parent | Merge branch 'docs-next' of git://git.lwn.net/linux (diff) | |
download | kernel-qcow2-linux-edc2988c548db05e33b921fed15821010bc74895.tar.gz kernel-qcow2-linux-edc2988c548db05e33b921fed15821010bc74895.tar.xz kernel-qcow2-linux-edc2988c548db05e33b921fed15821010bc74895.zip |
Merge branch 'linus' into locking/core, to fix up conflicts
Conflicts:
mm/page_alloc.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'Documentation/input')
-rw-r--r-- | Documentation/input/input.rst | 2 | ||||
-rw-r--r-- | Documentation/input/joydev/index.rst | 1 |
2 files changed, 1 insertions, 2 deletions
diff --git a/Documentation/input/input.rst b/Documentation/input/input.rst index 3b3a22975106..47f86a4bf16c 100644 --- a/Documentation/input/input.rst +++ b/Documentation/input/input.rst @@ -109,7 +109,7 @@ evdev nodes are created with minors starting with 256. keyboard ~~~~~~~~ -``keyboard`` is in-kernel input handler ad is a part of VT code. It +``keyboard`` is in-kernel input handler and is a part of VT code. It consumes keyboard keystrokes and handles user input for VT consoles. mousedev diff --git a/Documentation/input/joydev/index.rst b/Documentation/input/joydev/index.rst index 8d9666c7561c..ebcff43056e2 100644 --- a/Documentation/input/joydev/index.rst +++ b/Documentation/input/joydev/index.rst @@ -12,7 +12,6 @@ Linux Joystick support .. toctree:: :maxdepth: 3 - :numbered: joystick joystick-api |