Merge branch 'x86/urgent' into x86/core
authorIngo Molnar <mingo@elte.hu>
Thu, 5 Mar 2009 20:48:31 +0000 (21:48 +0100)
committerIngo Molnar <mingo@elte.hu>
Thu, 5 Mar 2009 20:48:50 +0000 (21:48 +0100)
commita1413c89ae6a4b7a9a43f7768934a81ffb5c629a
tree7e16be26407c5fd4dfbfeb98b11590809a963664
parentf254f3909efaf59ca2d0f408de2d044dace60706
parentdd4124a8a06bca89c077a16437edac010f0bb993
Merge branch 'x86/urgent' into x86/core

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
arch/x86/include/asm/fixmap.h
arch/x86/kernel/efi.c
arch/x86/kernel/efi_64.c
arch/x86/kernel/reboot.c
arch/x86/kernel/setup.c
include/linux/sched.h
init/main.c
kernel/sched.c