Merge branch 'mpi-master' into wip-k-fmlpwip-k-fmlp

Conflicts:
	litmus/sched_cedf.c

1 files changed, 1 insertions, 1 deletions

diff --git a/arch/powerpc/kernel/l2cr_6xx.S b/arch/powerpc/kernel/l2cr_6xx.S
index 2a2f3c3f6d80..97ec8557f974 100644
--- a/arch/powerpc/kernel/l2cr_6xx.S
+++ b/arch/powerpc/kernel/l2cr_6xx.S
@@ -151,7 +151,7 @@ END_FTR_SECTION_IFSET(CPU_FTR_ALTIVEC)
          /**** Might be a good idea to set L2DO here - to prevent instructions
                from getting into the cache.  But since we invalidate
                the next time we enable the cache it doesn't really matter.
-               Don't do this unless you accomodate all processor variations.
+               Don't do this unless you accommodate all processor variations.
                The bit moved on the 7450.....
           ****/