Commits
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>
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>