From: H. Peter Anvin <hpa@zytor.com>
Date: Wed, 30 Jan 2008 12:30:30 +0000 (+0100)
Subject: x86: actually merge <asm/alternative.h>
X-Git-Tag: v2.6.25-rc1~1143^2~791
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6b59257082e136fbbce1aa017575a451c0df0592;p=pandora-kernel.git

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>
---

Reading git-diff-tree failed