Merge branch 'master' of master.kernel.org:/pub/scm/linux/kernel/git/torvalds/linux-2.6

[~andy/linux] / Documentation / networking / can.txt

diff --git a/Documentation/networking/can.txt b/Documentation/networking/can.txt
index 6cd6627c3293ded2cf0d97ea1f3be4886182d223..cd79735013f94728c15359f292f5fad4b1d0f838 100644 (file)
--- a/Documentation/networking/can.txt
+++ b/Documentation/networking/can.txt
@@ -334,7 +334,7 @@ solution for a couple of reasons:
             return 1;
     }
 
-    /* paraniod check ... */
+    /* paranoid check ... */
     if (nbytes < sizeof(struct can_frame)) {
             fprintf(stderr, "read: incomplete CAN frame\n");
             return 1;