tree 0e56f92a7b94556f9e1f429e5623c1b9c430bed5
parent 1d8a1f6b51f6b195dfdcf05821be97edede5664a
author H. Peter Anvin <hpa@zytor.com> 1201696230 +0100
committer Ingo Molnar <mingo@elte.hu> 1201696230 +0100

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>