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)
commit8a423ff0c4a0472607bbed6790fdaeec54af2ebb
tree676fab07c33482e2b81cd1596c206c9b5b0c0b1b
parent4757d7d8d00c5f8b2c176ca03b0a8eabbc206664
x86: merge include/asm-x86/sparsemem.h

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