Merge branch 'linus' into cpus4096

Conflicts:

	kernel/stop_machine.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>

1 files changed, 0 insertions, 14 deletions

diff --git a/include/asm-sparc/dcr.h b/include/asm-sparc/dcr.h
deleted file mode 100644
index 620c9ba642e9..000000000000
--- a/include/asm-sparc/dcr.h
+++ /dev/null
@@ -1,14 +0,0 @@
-#ifndef _SPARC64_DCR_H
-#define _SPARC64_DCR_H
-
-/* UltraSparc-III/III+ Dispatch Control Register, ASR 0x12 */
-#define DCR_DPE         0x0000000000001000 /* III+: D$ Parity Error Enable      */
-#define DCR_OBS         0x0000000000000fc0 /* Observability Bus Controls        */
-#define DCR_BPE         0x0000000000000020 /* Branch Predict Enable             */
-#define DCR_RPE         0x0000000000000010 /* Return Address Prediction Enable  */
-#define DCR_SI          0x0000000000000008 /* Single Instruction Disable        */
-#define DCR_IPE         0x0000000000000004 /* III+: I$ Parity Error Enable      */
-#define DCR_IFPOE       0x0000000000000002 /* IRQ FP Operation Enable           */
-#define DCR_MS          0x0000000000000001 /* Multi-Scalar dispatch             */
-
-#endif /* _SPARC64_DCR_H */