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

Merge branch 'x86/urgent' into x86/sgx, to resolve conflict 



Conflicts:
	arch/x86/kernel/cpu/sgx/main.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents 379e4de9 ac5d272a
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment