]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit8bd5cfaa6263979ac22abea61751c50a51963b85
tree7e16be26407c5fd4dfbfeb98b11590809a963664
parentd692006dde0b896bca9d84fc91bfca066a736025
parent5551866415223b1fd5e0347f4f4523f0fd0353c8
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