x86: merge mpspec variants
authorThomas Gleixner <tglx@linutronix.de>
Wed, 30 Jan 2008 12:30:35 +0000 (13:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 30 Jan 2008 12:30:35 +0000 (13:30 +0100)
commitc2805aa1d8ae51c7582d2ccbd736afa545cf5cc4
tree90ecc8370d0118300646f357a8e8d34a06df448a
parent64883ab0e3386d72112a9091d886352a7b4b8bf6
x86: merge mpspec variants

The delta is now minimal. Merge them

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
include/asm-x86/mpspec.h
include/asm-x86/mpspec_32.h [deleted file]
include/asm-x86/mpspec_64.h [deleted file]