From: Ingo Molnar <mingo@elte.hu>
Date: Fri, 13 Feb 2009 08:49:38 +0000 (+0100)
Subject: Merge branch 'x86/core' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2~508
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b1864e9a1afef41709886072c6e6248def0386f4;p=pandora-kernel.git

Merge branch 'x86/core' into perfcounters/core

Conflicts:
	arch/x86/Kconfig
	arch/x86/kernel/apic.c
	arch/x86/kernel/setup_percpu.c
---

b1864e9a1afef41709886072c6e6248def0386f4
Reading git-diff-tree failed