x86: merge shmbuf_32/64.h
authorThomas Gleixner <tglx@linutronix.de>
Tue, 23 Oct 2007 20:37:24 +0000 (22:37 +0200)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 23 Oct 2007 20:37:24 +0000 (22:37 +0200)
Signed-off-by: Ingo Molnar <mingo@elte.hu>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
include/asm-x86/Kbuild
include/asm-x86/shmbuf.h
include/asm-x86/shmbuf_32.h [deleted file]
include/asm-x86/shmbuf_64.h [deleted file]

Simple merge
Simple merge
diff --cc include/asm-x86/shmbuf_32.h
Simple merge
diff --cc include/asm-x86/shmbuf_64.h
Simple merge