e2a0ffa635488feae5587640a7c21372f3
parent 2b4fa851b2f06fdb04cac808b57324f5e51e1578
parent 8700600a74852d75eb965b969dcf9f58e2b32546
author Ingo Molnar <mingo@elte.hu> 1215512228 +0200
committer Ingo Molnar <mingo@elte.hu> 1215512228 +0200

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>
ª^v¼œ