x86: merge include/asm-x86/sparsemem.h
authorThomas Gleixner <tglx@linutronix.de>
Wed, 30 Jan 2008 12:30:37 +0000 (13:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 30 Jan 2008 12:30:37 +0000 (13:30 +0100)
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Ingo Molnar <mingo@elte.hu>
include/asm-x86/io_apic.h
include/asm-x86/io_apic_32.h [deleted file]
include/asm-x86/io_apic_64.h [deleted file]

Simple merge
diff --cc include/asm-x86/io_apic_32.h
Simple merge
diff --cc include/asm-x86/io_apic_64.h
Simple merge