From: Ingo Molnar <mingo@elte.hu>
Date: Sun, 18 Jan 2009 17:15:49 +0000 (+0100)
Subject: Merge branch 'core/percpu' into perfcounters/core
X-Git-Tag: v2.6.31-rc1~383^2~527
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=af37501c792107c2bde1524bdae38d9a247b841a;p=pandora-kernel.git

Merge branch 'core/percpu' into perfcounters/core

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

We merge tip/core/percpu into tip/perfcounters/core because of a
semantic and contextual conflict: the former eliminates the PDA,
while the latter extends it with apic_perf_irqs field.

Resolve the conflict by moving the new field to the irq_cpustat
structure on 64-bit too.

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

af37501c792107c2bde1524bdae38d9a247b841a
Reading git-diff-tree failed