git.baikalelectronics.ru Git - kernel.git/commit

]> git.baikalelectronics.ru Git - kernel.git/commit

projects / kernel.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 8657972 afabc26)

author	Ingo Molnar <mingo@elte.hu>
	Wed, 4 Mar 2009 19:20:10 +0000 (20:20 +0100)
committer	Ingo Molnar <mingo@elte.hu>
	Wed, 4 Mar 2009 19:20:10 +0000 (20:20 +0100)
commit	e4880f562d62d46583eb66e5d1770c90d91a15cc
tree	d9e63711b0958748accff409596eca742a3c360b	tree \| snapshot
parent	8657972f0be0e2809941cf7e644c868d1420e2d5	commit \| diff
parent	afabc261dcff139d48ca62a7b9a55f5e1b091d25	commit \| diff

Merge branch 'x86/urgent' into x86/mm

Conflicts:
arch/x86/include/asm/fixmap_64.h
Semantic merge:
arch/x86/include/asm/fixmap.h

Signed-off-by: Ingo Molnar <mingo@elte.hu>

Makefile	diff1 \|	diff2 \|	blob \| history
arch/x86/include/asm/fixmap.h	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/efi.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/efi_64.c	diff1 \|	diff2 \|	blob \| history
arch/x86/kernel/setup.c	diff1 \|	diff2 \|	blob \| history
include/linux/sched.h	diff1 \|	diff2 \|	blob \| history
init/main.c	diff1 \|	diff2 \|	blob \| history
kernel/sched.c	diff1 \|	diff2 \|	blob \| history

Linux Kernel Source Tree.