From: Ingo Molnar <mingo@elte.hu>
Date: Thu, 26 Mar 2009 20:39:17 +0000 (+0100)
Subject: Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2
X-Git-Tag: v2.6.30-rc1~639^2~1
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e15cf04860074ad032e88c306bea656bbdd0f22;p=pandora-kernel.git

Merge branch 'core/percpu' into percpu-cpumask-x86-for-linus-2

Conflicts:
	arch/parisc/kernel/irq.c
	arch/x86/include/asm/fixmap_64.h
	arch/x86/include/asm/setup.h
	kernel/irq/handle.c

Semantic merge:
        arch/x86/include/asm/fixmap.h

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

6e15cf04860074ad032e88c306bea656bbdd0f22
Reading git-diff-tree failed