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

[linux-2.6-omap-h63xx.git] / arch / alpha / kernel / err_marvel.c

diff --git a/arch/alpha/kernel/err_marvel.c b/arch/alpha/kernel/err_marvel.c
index f2956ac8dccc775f60f866a24eadae130333e5fe..497877bf20127daad85ee837ea829eec85c982aa 100644 (file)
--- a/arch/alpha/kernel/err_marvel.c
+++ b/arch/alpha/kernel/err_marvel.c
@@ -1082,7 +1082,7 @@ marvel_machine_check(u64 vector, u64 la_ptr)
        }       
 
        /*
-        * A system event or error has occured, handle it here.
+        * A system event or error has occurred, handle it here.
         *
         * Any errors in the logout frame have already been cleared by the
         * PALcode, so just parse it.