From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 26 Feb 2009 12:02:23 +0000 (+0100)
Subject: Merge branch 'x86/core' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2~500
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=8e818179eb9e8f9e44d8410dd2a25077d026a08e;p=pandora-kernel.git

Merge branch 'x86/core' into perfcounters/core

Conflicts:
	arch/x86/kernel/apic/apic.c
	arch/x86/kernel/irqinit_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
---

8e818179eb9e8f9e44d8410dd2a25077d026a08e
Reading git-diff-tree failed