Merge commit 'linus/master' into merge-linus

Conflicts:

	arch/x86/kvm/i8254.c

1 files changed, 0 insertions, 23 deletions

diff --git a/include/asm-mips/mach-tx49xx/cpu-feature-overrides.h b/include/asm-mips/mach-tx49xx/cpu-feature-overrides.h
deleted file mode 100644
index 275eaf92c748..000000000000
--- a/include/asm-mips/mach-tx49xx/cpu-feature-overrides.h
+++ /dev/null
@@ -1,23 +0,0 @@
-#ifndef __ASM_MACH_TX49XX_CPU_FEATURE_OVERRIDES_H
-#define __ASM_MACH_TX49XX_CPU_FEATURE_OVERRIDES_H
-
-#define cpu_has_llsc    1
-#define cpu_has_64bits  1
-#define cpu_has_inclusive_pcaches       0
-
-#define cpu_has_mips16          0
-#define cpu_has_mdmx            0
-#define cpu_has_mips3d          0
-#define cpu_has_smartmips       0
-#define cpu_has_vtag_icache     0
-#define cpu_has_ic_fills_f_dc   0
-#define cpu_has_dsp     0
-#define cpu_has_mipsmt  0
-#define cpu_has_userlocal       0
-
-#define cpu_has_mips32r1        0
-#define cpu_has_mips32r2        0
-#define cpu_has_mips64r1        0
-#define cpu_has_mips64r2        0
-
-#endif /* __ASM_MACH_TX49XX_CPU_FEATURE_OVERRIDES_H */