Skip to content
Commit 4b62ac9a authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'x86/nmi' into x86/devel 



Conflicts:

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

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 2b4fa851 8700600a
Hide whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment