| commit | 91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Fri Nov 10 08:06:47 2017 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Fri Nov 10 08:06:47 2017 +0100 |
| tree | dbea28420ff33aca40be8d3cd901305064b4ea24 | |
| parent | d04fdafc066fed10cc9610b2f36f1d0ff0327864 [diff] | |
| parent | 1c9dbd4615fd751e5e0b99807a3c7c8612e28e20 [diff] |
Merge branch 'linus' into x86/asm, to resolve conflict Conflicts: arch/x86/mm/mem_encrypt.c Signed-off-by: Ingo Molnar <mingo@kernel.org>