diff options
| author | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
|---|---|---|
| committer | Dmitry Torokhov <dmitry.torokhov@gmail.com> | 2014-08-07 02:36:12 -0400 |
| commit | 5e2aa2ed08e2e280121dc7cf5609c87d464f12ef (patch) | |
| tree | ca7d7b1480285e3b617fecc5b41f0ce150a82c32 /Documentation/input | |
| parent | f62d14a8072b9756db36ba394e2b267470a40240 (diff) | |
| parent | fc8104bc5a3f6f49d79f45f2706f79f77a9fb2ae (diff) | |
Merge branch 'next' into for-linus
Prepare first round of input updates for 3.17.
Diffstat (limited to 'Documentation/input')
| -rw-r--r-- | Documentation/input/alps.txt | 2 | ||||
| -rw-r--r-- | Documentation/input/input.txt | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/Documentation/input/alps.txt b/Documentation/input/alps.txt index e544c7ff8cfa..90bca6f988e1 100644 --- a/Documentation/input/alps.txt +++ b/Documentation/input/alps.txt | |||
| @@ -94,7 +94,7 @@ PS/2 packet format | |||
| 94 | 94 | ||
| 95 | Note that the device never signals overflow condition. | 95 | Note that the device never signals overflow condition. |
| 96 | 96 | ||
| 97 | ALPS Absolute Mode - Protocol Verion 1 | 97 | ALPS Absolute Mode - Protocol Version 1 |
| 98 | -------------------------------------- | 98 | -------------------------------------- |
| 99 | 99 | ||
| 100 | byte 0: 1 0 0 0 1 x9 x8 x7 | 100 | byte 0: 1 0 0 0 1 x9 x8 x7 |
diff --git a/Documentation/input/input.txt b/Documentation/input/input.txt index 666c06c5ab0c..0acfddbe2028 100644 --- a/Documentation/input/input.txt +++ b/Documentation/input/input.txt | |||
| @@ -226,7 +226,7 @@ And so on up to js31. | |||
| 226 | ~~~~~~~~~~~ | 226 | ~~~~~~~~~~~ |
| 227 | evdev is the generic input event interface. It passes the events | 227 | evdev is the generic input event interface. It passes the events |
| 228 | generated in the kernel straight to the program, with timestamps. The | 228 | generated in the kernel straight to the program, with timestamps. The |
| 229 | API is still evolving, but should be useable now. It's described in | 229 | API is still evolving, but should be usable now. It's described in |
| 230 | section 5. | 230 | section 5. |
| 231 | 231 | ||
| 232 | This should be the way for GPM and X to get keyboard and mouse | 232 | This should be the way for GPM and X to get keyboard and mouse |