diff options
| author | Ingo Molnar <mingo@kernel.org> | 2017-11-10 08:06:47 +0100 |
|---|---|---|
| committer | Ingo Molnar <mingo@kernel.org> | 2017-11-10 08:06:47 +0100 |
| commit | 91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb (patch) | |
| tree | dbea28420ff33aca40be8d3cd901305064b4ea24 /scripts | |
| parent | d04fdafc066fed10cc9610b2f36f1d0ff0327864 (diff) | |
| parent | 1c9dbd4615fd751e5e0b99807a3c7c8612e28e20 (diff) | |
| download | blackbird-op-linux-91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb.tar.gz blackbird-op-linux-91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb.zip | |
Merge branch 'linus' into x86/asm, to resolve conflict
Conflicts:
arch/x86/mm/mem_encrypt.c
Signed-off-by: Ingo Molnar <mingo@kernel.org>
Diffstat (limited to 'scripts')
0 files changed, 0 insertions, 0 deletions
