Skip to content
Commit 0d595972 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

Merge branch 'linus' into x86/mce3 



Conflicts:
	arch/x86/kernel/cpu/mcheck/mce_64.c
	arch/x86/kernel/irq.c

Merge reason: Resolve the conflicts above.

Signed-off-by: default avatarIngo Molnar <mingo@elte.hu>
parents 62fdac59 512626a0
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