Merge branch 'linus' into x86/dma, to resolve a conflict with upstream
authorIngo Molnar <mingo@kernel.org>
Sat, 24 Mar 2018 08:25:26 +0000 (09:25 +0100)
committerIngo Molnar <mingo@kernel.org>
Sat, 24 Mar 2018 08:25:26 +0000 (09:25 +0100)
commitea2301b6220117398a1de4f4bc853fbe886d5e08
tree8823c3becd0b4fd3db9706892845cd02f760627a
parent0803e6051c1562e1525c3e044313390bf8b35c2b
parent99fec39e7725d091c94d1bb0242e40c8092994f6
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>
arch/x86/mm/init_64.c