From: Brian Gerst <bgerst@didntduck.org>
Date: Mon, 15 Oct 2007 11:57:46 +0000 (+0200)
Subject: x86: trivial header merges
X-Git-Tag: v2.6.24-rc1~476^2~26
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=020bd9f1c766ca743556461a70a5b5d559b7e60c;p=pandora-kernel.git

x86: trivial header merges

Merge 32/64-bit headers that simply redirect to asm-generic

[tglx: fixup Kbuild as well]

Signed-off-by: Brian Gerst <bgerst@didntduck.org>
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

Reading git-diff-tree failed