Merge branch 'x86/topology' into perf/core, to prepare for new patches

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

diff --cc arch/x86/events/intel/rapl.c
Simple merge

diff --cc arch/x86/events/intel/uncore.c
Simple merge

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

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

diff --cc drivers/hwmon/coretemp.c
Simple merge