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 /include/asm-generic | |
| parent | Merge branch 'x86/mm' into x86/asm, to merge branches (diff) | |
| parent | Merge branch 'akpm' (patches from Andrew) (diff) | |
| download | linux-91a6a6cfee8ad34ea4cc10a54c0765edfe437cdb.tar.xz 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 'include/asm-generic')
0 files changed, 0 insertions, 0 deletions