| commit | 413d63d71b222108d19703f3fd5cf9108652a730 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sat Aug 26 09:19:13 2017 +0200 |
| committer | Ingo Molnar <mingo@kernel.org> | Sat Aug 26 09:19:13 2017 +0200 |
| tree | 4680de6aebb6430dc5f3d9327f86d65149e6b5ae | |
| parent | d6c8103b0265d8db30e20e948a4f06382bbdaea7 [diff] | |
| parent | 90a6cd503982bfd33ce8c70eb49bd2dd33bc6325 [diff] |
Merge branch 'linus' into x86/mm to pick up fixes and to fix conflicts Conflicts: arch/x86/kernel/head64.c arch/x86/mm/mmap.c Signed-off-by: Ingo Molnar <mingo@kernel.org>