| commit | ea2301b6220117398a1de4f4bc853fbe886d5e08 | [log] [tgz] |
|---|---|---|
| author | Ingo Molnar <mingo@kernel.org> | Sat Mar 24 09:25:26 2018 +0100 |
| committer | Ingo Molnar <mingo@kernel.org> | Sat Mar 24 09:25:26 2018 +0100 |
| tree | 8823c3becd0b4fd3db9706892845cd02f760627a | |
| parent | 0803e6051c1562e1525c3e044313390bf8b35c2b [diff] | |
| parent | 99fec39e7725d091c94d1bb0242e40c8092994f6 [diff] |
Merge branch 'linus' into x86/dma, to resolve a conflict with upstream Conflicts: arch/x86/mm/init_64.c Signed-off-by: Ingo Molnar <mingo@kernel.org>