Merge branch 'x86/mm' into x86/dma, to pick up dependencies

Signed-off-by: Ingo Molnar <mingo@kernel.org>