Commit 85df1cd1 authored by Ingo Molnar's avatar Ingo Molnar
Browse files

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



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

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