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

Merge branch 'linus' into x86/entry, to resolve conflicts 



Conflicts:
	arch/x86/kernel/traps.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 145a773a 8be3a53e
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