tree dbea28420ff33aca40be8d3cd901305064b4ea24
parent d04fdafc066fed10cc9610b2f36f1d0ff0327864
parent 1c9dbd4615fd751e5e0b99807a3c7c8612e28e20
author Ingo Molnar <mingo@kernel.org> 1510297607 +0100
committer Ingo Molnar <mingo@kernel.org> 1510297607 +0100

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

 Conflicts:
	arch/x86/mm/mem_encrypt.c

Signed-off-by: Ingo Molnar <mingo@kernel.org>