arch/x86/mm/mem_encrypt.c · d6ec9d9a4def52a5094237564eaf6f6979fd7a27 · nexedi / linux · GitLab

Find file Blame History Permalink

Merge branch 'linus' into x86/asm, to resolve conflict · 91a6a6cf
Ingo Molnar authored Nov 10, 2017
```
 Conflicts:
	arch/x86/mm/mem_encrypt.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
```
91a6a6cf

mem_encrypt.c 23.8 KB