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

Merge branch 'core/percpu' into perfcounters/core

Conflicts:
	arch/x86/include/asm/hardirq_32.h
	arch/x86/include/asm/hardirq_64.h

Semantic merge:
	arch/x86/include/asm/hardirq.h
	[ added apic_perf_irqs field. ]

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

bfe2a3c3b5bf479788d5d5c5561346be6b169043
Reading git-diff-tree failed