]> err.no Git - linux-2.6/commit
projects / linux-2.6 / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(parent: 1d8a1f6) | patch
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)
commit6b59257082e136fbbce1aa017575a451c0df0592
tree0e56f92a7b94556f9e1f429e5623c1b9c430bed5tree | snapshot
parent1d8a1f6b51f6b195dfdcf05821be97edede5664acommit | diff
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 diff | blob | history
include/asm-x86/alternative_32.h [deleted file] blob | history
include/asm-x86/alternative_64.h [deleted file] blob | history
Linux 2.6 source tree