Merge branch 'x86/mm' into core/percpu
commit198030782cedf25391e67e7c88b04f87a5eb6563
authorIngo Molnar <mingo@elte.hu>
Wed, 21 Jan 2009 09:39:51 +0000 (21 10:39 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 21 Jan 2009 09:39:51 +0000 (21 10:39 +0100)
tree5b7368c6bf052bcb4bb273497a57900720d36f51
parent4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e
parent92181f190b649f7ef2b79cbf5c00f26ccc66da2a
Merge branch 'x86/mm' into core/percpu

Conflicts:
arch/x86/mm/fault.c
arch/powerpc/kernel/vmlinux.lds.S
arch/powerpc/sysdev/mpic.c
arch/x86/mm/fault.c
arch/x86/mm/pat.c
arch/x86/mm/tlb.c
include/linux/magic.h
kernel/exit.c
kernel/fork.c
kernel/sched.c