Merge branch 'x86/nmi' into x86/devel
authorIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 10:17:08 +0000 (12:17 +0200)
committerIngo Molnar <mingo@elte.hu>
Tue, 8 Jul 2008 10:17:08 +0000 (12:17 +0200)
commit4b62ac9a2b859f932afd5625362c927111b7dd9b
tree30b159e2a0ffa635488feae5587640a7c21372f3
parent2b4fa851b2f06fdb04cac808b57324f5e51e1578
parent8700600a74852d75eb965b969dcf9f58e2b32546
Merge branch 'x86/nmi' into x86/devel

Conflicts:

arch/x86/kernel/nmi.c
arch/x86/kernel/nmi_32.c

Signed-off-by: Ingo Molnar <mingo@elte.hu>
arch/x86/kernel/Makefile
arch/x86/kernel/nmi.c
arch/x86/kernel/traps_64.c
include/asm-x86/nmi.h