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

Merge branch 'x86/ras' into x86/core, to fix conflicts 



Conflicts:
	arch/x86/include/asm/irq_vectors.h

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents c8e56d20 243d657e
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