x86: merge required-features.h
authorBrian Gerst <bgerst@didntduck.org>
Sat, 20 Oct 2007 17:41:41 +0000 (13:41 -0400)
committerThomas Gleixner <tglx@linutronix.de>
Tue, 23 Oct 2007 20:37:24 +0000 (22:37 +0200)
Signed-off-by: Brian Gerst <bgerst@didntduck.org>
include/asm-x86/required-features.h
include/asm-x86/required-features_32.h [deleted file]
include/asm-x86/required-features_64.h [deleted file]

Simple merge
diff --cc include/asm-x86/required-features_32.h
Simple merge
diff --cc include/asm-x86/required-features_64.h
Simple merge