Merge branch 'fortglx/39/tip/timers/rtc' of git://git.linaro.org/people/jstultz/linux...

[pandora-kernel.git] / arch / mips / kernel / process.c

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index ae167df..d2112d3 100644 (file)
--- a/arch/mips/kernel/process.c
+++ b/arch/mips/kernel/process.c
@@ -410,7 +410,7 @@ unsigned long unwind_stack(struct task_struct *task, unsigned long *sp,
        if (!kallsyms_lookup_size_offset(pc, &size, &ofs))
                return 0;
        /*
-        * Return ra if an exception occured at the first instruction
+        * Return ra if an exception occurred at the first instruction
         */
        if (unlikely(ofs == 0)) {
                pc = *ra;