Merge branches 'doc', 'multitouch', 'upstream' and 'upstream-fixes' into for-linus

[pandora-kernel.git] / Documentation / networking / caif / Linux-CAIF.txt

diff --git a/Documentation/networking/caif/Linux-CAIF.txt b/Documentation/networking/caif/Linux-CAIF.txt
index 7fe7a9a..e52fd62 100644 (file)
--- a/Documentation/networking/caif/Linux-CAIF.txt
+++ b/Documentation/networking/caif/Linux-CAIF.txt
@@ -136,7 +136,7 @@ The CAIF Protocol implementation contains:
       - CFMUX CAIF Mux layer. Handles multiplexing between multiple
        physical bearers and multiple channels such as VEI, Datagram, etc.
        The MUX keeps track of the existing CAIF Channels and
-       Physical Instances and selects the apropriate instance based
+       Physical Instances and selects the appropriate instance based
        on Channel-Id and Physical-ID.
 
       - CFFRML CAIF Framing layer. Handles Framing i.e. Frame length