Merge branch 'x86/mm' into x86/asm, to unify the two branches for simplicity

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

diff --cc arch/x86/kernel/apic/x2apic_cluster.c
Simple merge

diff --cc arch/x86/kernel/apic/x2apic_uv_x.c
Simple merge

diff --cc arch/x86/kernel/cpu/common.c
Simple merge

diff --cc arch/x86/kernel/ptrace.c
Simple merge

diff --cc arch/x86/kernel/setup.c
Simple merge

diff --cc arch/x86/kernel/setup_percpu.c
Simple merge