git.openpandora.org / pandora-kernel.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input
[pandora-kernel.git] / Documentation / ia64 / aliasing-test.c
diff --git a/Documentation/ia64/aliasing-test.c b/Documentation/ia64/aliasing-test.c
index 3dfb76c..5caa2af 100644 (file)
--- a/Documentation/ia64/aliasing-test.c
+++ b/Documentation/ia64/aliasing-test.c
@@ -177,7 +177,7 @@ static int scan_rom(char *path, char *file)
 
                        /*
                         * It's OK if the ROM is unreadable.  Maybe there
-                        * is no ROM, or some other error ocurred.  The
+                        * is no ROM, or some other error occurred.  The
                         * important thing is that no MCA happened.
                         */
                        if (rc > 0)
Pandora Kernel Repository