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

Merge branch 'linus' into x86/asm, to resolve conflict 



 Conflicts:
	arch/x86/mm/mem_encrypt.c

Signed-off-by: default avatarIngo Molnar <mingo@kernel.org>
parents d04fdafc 1c9dbd46
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