]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commit2c786f57c95d962bd1282798676b41466b732fa0
tree8823c3becd0b4fd3db9706892845cd02f760627a
parent231892dc20272739700b55656b1be529ac3c9575
parent1d0404e7ccebbcaf06cc20a4796c2703ce3143e2
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