Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input

[~andy/linux] / Documentation / input / alps.txt

diff --git a/Documentation/input/alps.txt b/Documentation/input/alps.txt
index 9b1084c8c0b31ec35353c8006090145285fa41af..e544c7ff8cfa5c6c60697aae738eb4b029e86d23 100644 (file)
--- a/Documentation/input/alps.txt
+++ b/Documentation/input/alps.txt
@@ -161,7 +161,7 @@ number of contacts (f1 and f0 in the table below).
 
 This packet only appears after a position packet with the mt bit set, and
 usually only appears when there are two or more contacts (although
-occassionally it's seen with only a single contact).
+occasionally it's seen with only a single contact).
 
 The final v3 packet type is the trackstick packet.