From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 27 Jan 2009 11:03:24 +0000 (+0100)
Subject: Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc... 
X-Git-Tag: v2.6.30-rc1~2^2~50^2~52
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=4369f1fb7cd4cf777312f43e1cb9aa5504fc4125;p=pandora-kernel.git

Merge branch 'tj-percpu' of git://git./linux/kernel/git/tj/misc into core/percpu

Conflicts:
	arch/x86/kernel/setup_percpu.c

Semantic conflict:

	arch/x86/kernel/cpu/common.c

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

4369f1fb7cd4cf777312f43e1cb9aa5504fc4125
Reading git-diff-tree failed