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

Conflicts:
	drivers/net/smsc911x.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/mips/kernel/process.c b/arch/mips/kernel/process.c
index ae167df73dd..d2112d3cf11 100644
--- 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;