diff --git a/[refs] b/[refs]
index 5f90e48e6971..b422ac65ed7d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2fe25f67a55ea0e6416304fa43d58fae93b7300a
+refs/heads/master: aaa49075c6a75332dac6fb401518c0a72b103443
diff --git a/trunk/include/asm-mips/mach-generic/cpu-feature-overrides.h b/trunk/include/asm-mips/mach-generic/cpu-feature-overrides.h
index 0aecfd08e39a..7c185bb06f13 100644
--- a/trunk/include/asm-mips/mach-generic/cpu-feature-overrides.h
+++ b/trunk/include/asm-mips/mach-generic/cpu-feature-overrides.h
@@ -8,6 +8,6 @@
 #ifndef __ASM_MACH_GENERIC_CPU_FEATURE_OVERRIDES_H
 #define __ASM_MACH_GENERIC_CPU_FEATURE_OVERRIDES_H
 
-/* Intensionally empty file ...  */
+/* Intentionally empty file ...  */
 
 #endif /* __ASM_MACH_GENERIC_CPU_FEATURE_OVERRIDES_H */