Merge branch 'tj-percpu' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/misc...
authorIngo Molnar <mingo@elte.hu>
Tue, 24 Feb 2009 20:52:45 +0000 (21:52 +0100)
committerIngo Molnar <mingo@elte.hu>
Tue, 24 Feb 2009 20:52:45 +0000 (21:52 +0100)
Conflicts:
arch/x86/include/asm/pgtable.h


Trivial merge