diff options
author | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 16:55:37 +0100 |
---|---|---|
committer | Jiri Kosina <jkosina@suse.cz> | 2010-03-08 16:55:37 +0100 |
commit | 318ae2edc3b29216abd8a2510f3f80b764f06858 (patch) | |
tree | ce595adde342f57f379d277b25e4dd206988a052 /Documentation/input | |
parent | Merge git://git.kernel.org/pub/scm/linux/kernel/git/amit/virtio-console (diff) | |
parent | doc: fix typo in comment explaining rb_tree usage (diff) | |
download | linux-318ae2edc3b29216abd8a2510f3f80b764f06858.tar.xz linux-318ae2edc3b29216abd8a2510f3f80b764f06858.zip |
Merge branch 'for-next' into for-linus
Conflicts:
Documentation/filesystems/proc.txt
arch/arm/mach-u300/include/mach/debug-macro.S
drivers/net/qlge/qlge_ethtool.c
drivers/net/qlge/qlge_main.c
drivers/net/typhoon.c
Diffstat (limited to 'Documentation/input')
-rw-r--r-- | Documentation/input/rotary-encoder.txt | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/Documentation/input/rotary-encoder.txt b/Documentation/input/rotary-encoder.txt index 3a6aec40c0b0..8b4129de1d2d 100644 --- a/Documentation/input/rotary-encoder.txt +++ b/Documentation/input/rotary-encoder.txt @@ -75,7 +75,7 @@ and the number of steps or will clamp at the maximum and zero depending on the configuration. Because GPIO to IRQ mapping is platform specific, this information must -be given in seperately to the driver. See the example below. +be given in separately to the driver. See the example below. ---------<snip>--------- |