git.samba.org - sfrench/cifs-2.6.git/commit

git.samba.org / sfrench / cifs-2.6.git / commit

summary | shortlog | log | commit | commitdiff | tree
(merge: 6298e71 dd39ecf)

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	6d2e91bf80e4410207f01edb0962aec9213f3533
tree	d9e63711b0958748accff409596eca742a3c360b	tree
parent	6298e719cf388f43b674f43799af467d3e4e5aa7	commit \| diff
parent	dd39ecf522ba86c70809715af46e6557f6491131	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

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