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)
commit0edcf8d6926f4038443dbc24e319530177ca0353
tree6010af62f73d01ab673d5106f310eaf4f4228e32
parent87b203079ed949de52f0d92aeae20e5e0116c12f
parent40150d37be7f7949b2ec07d511244da856647d84
Merge branch 'tj-percpu' of git://git./linux/kernel/git/tj/misc into core/percpu

Conflicts:
arch/x86/include/asm/pgtable.h
arch/x86/Kconfig
arch/x86/include/asm/mmzone_32.h
arch/x86/include/asm/pgtable.h
arch/x86/kernel/irq_32.c
arch/x86/mm/init_32.c
block/blktrace.c
include/linux/vmalloc.h
kernel/sched.c
mm/vmalloc.c