From: Ingo Molnar <mingo@elte.hu>
Date: Tue, 24 Feb 2009 20:52:45 +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~19
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=0edcf8d6926f4038443dbc24e319530177ca0353;p=pandora-kernel.git

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

Conflicts:
	arch/x86/include/asm/pgtable.h
---

0edcf8d6926f4038443dbc24e319530177ca0353
Reading git-diff-tree failed