]> git.baikalelectronics.ru Git - kernel.git/commit
x86: actually merge <asm/alternative.h>
authorH. Peter Anvin <hpa@zytor.com>
Wed, 30 Jan 2008 12:30:30 +0000 (13:30 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 30 Jan 2008 12:30:30 +0000 (13:30 +0100)
commite2afb747f950b038cfe3b4060a1551a16caee8f9
tree0e56f92a7b94556f9e1f429e5623c1b9c430bed5
parentbbaf09d1d7fee0145e2101ce9f008031a6f5cb7f
x86: actually merge <asm/alternative.h>

This actually merges <asm-x86/alternative_{32,64}.h> into
<asm-x86/alternative.h>.

Signed-off-by: H. Peter Anvin <hpa@zytor.com>
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/alternative.h
include/asm-x86/alternative_32.h [deleted file]
include/asm-x86/alternative_64.h [deleted file]