From: Thomas Gleixner <tglx@linutronix.de>
Date: Thu, 9 Dec 2010 17:17:25 +0000 (+0100)
Subject: Merge branch 'x86/amd-nb' into x86/apic-cleanups
X-Git-Tag: v2.6.38-rc1~458^2~11
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=d834a9dcecae834cd6b2bc5e50e1907738d9cf6a;p=pandora-kernel.git

Merge branch 'x86/amd-nb' into x86/apic-cleanups

Reason: apic cleanup series depends on x86/apic, x86/amd-nb x86/platform

Conflicts:
	arch/x86/include/asm/io_apic.h

Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---

d834a9dcecae834cd6b2bc5e50e1907738d9cf6a
Reading git-diff-tree failed