www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

]> www.pilppa.org Git - linux-2.6-omap-h63xx.git/commit

projects / linux-2.6-omap-h63xx.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 4ec71fa 92181f1)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 21 Jan 2009 09:39:51 +0000 (10:39 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 21 Jan 2009 09:39:51 +0000 (10:39 +0100)
commit	198030782cedf25391e67e7c88b04f87a5eb6563
tree	5b7368c6bf052bcb4bb273497a57900720d36f51	tree \| snapshot
parent	4ec71fa2d2c3f1040348f2604f4b8ccc833d1c2e	commit \| diff
parent	92181f190b649f7ef2b79cbf5c00f26ccc66da2a	commit \| diff

Merge branch 'x86/mm' into core/percpu

Conflicts:
arch/x86/mm/fault.c

arch/powerpc/kernel/vmlinux.lds.S	diff1 \|	diff2 \|	blob \| history
arch/powerpc/sysdev/mpic.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/fault.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/pat.c	diff1 \|	diff2 \|	blob \| history
arch/x86/mm/tlb.c	diff1 \|	diff2 \|	blob \| history
include/linux/magic.h	diff1 \|	diff2 \|	blob \| history
kernel/exit.c	diff1 \|	diff2 \|	blob \| history
kernel/fork.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history

Unnamed repository; edit this file 'description' to name the repository.