]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'x86/mm' into core/percpu
authorIngo Molnar <mingo@elte.hu>
Wed, 21 Jan 2009 09:39:51 +0000 (10:39 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 21 Jan 2009 09:39:51 +0000 (10:39 +0100)
commitc7509e191aa9d1ce7a9bf07853db1b53c6e03b40
tree5b7368c6bf052bcb4bb273497a57900720d36f51
parent0579fe64c5a7c9b792fed6c17a8e821dd4b94af6
parentc680f72f664db4fcfb126797ebc628235f6a3059
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