]> pilppa.com Git - linux-2.6-omap-h63xx.git/commit
projects / linux-2.6-omap-h63xx.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6298e71 dd39ecf)
Merge branch 'x86/urgent' into x86/mm
authorIngo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 19:20:10 +0000 (20:20 +0100)
committerIngo Molnar <mingo@elte.hu>
Wed, 4 Mar 2009 19:20:10 +0000 (20:20 +0100)
commit6d2e91bf80e4410207f01edb0962aec9213f3533
treed9e63711b0958748accff409596eca742a3c360btree | snapshot
parent6298e719cf388f43b674f43799af467d3e4e5aa7commit | diff
parentdd39ecf522ba86c70809715af46e6557f6491131commit | 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.