diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:50:34 -0400 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2014-06-04 11:50:34 -0400 |
| commit | 1aacb90eaaac057c10fd746e189553e04cfeb291 (patch) | |
| tree | eaf5b2eddc9e2e446b5402c106a3bf086aee925a /Documentation/input | |
| parent | b05d59dfceaea72565b1648af929b037b0f96d7f (diff) | |
| parent | 31789538e3ba7dd164e063d4978c96af1894be4c (diff) | |
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial into next
Pull trivial tree changes from Jiri Kosina:
"Usual pile of patches from trivial tree that make the world go round"
* 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial: (23 commits)
staging: go7007: remove reference to CONFIG_KMOD
aic7xxx: Remove obsolete preprocessor define
of: dma: doc fixes
doc: fix incorrect formula to calculate CommitLimit value
doc: Note need of bc in the kernel build from 3.10 onwards
mm: Fix printk typo in dmapool.c
modpost: Fix comment typo "Modules.symvers"
Kconfig.debug: Grammar s/addition/additional/
wimax: Spelling s/than/that/, wording s/destinatary/recipient/
aic7xxx: Spelling s/termnation/termination/
arm64: mm: Remove superfluous "the" in comment
of: Spelling s/anonymouns/anonymous/
dma: imx-sdma: Spelling s/determnine/determine/
ath10k: Improve grammar in comments
ath6kl: Spelling s/determnine/determine/
of: Improve grammar for of_alias_get_id() documentation
drm/exynos: Spelling s/contro/control/
radio-bcm2048.c: fix wrong overflow check
doc: printk-formats: do not mention casts for u64/s64
doc: spelling error changes
...
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 |