Merge branch 'x86/cpu' into perf/core, to pick up dependent changes

Signed-off-by: Ingo Molnar <[email protected]>

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

diff --cc drivers/powercap/intel_rapl.c
Simple merge

diff --cc drivers/thermal/intel/x86_pkg_temp_thermal.c
Simple merge

diff --cc tools/perf/builtin-top.c
Simple merge

diff --cc tools/perf/builtin-trace.c
Simple merge

diff --cc tools/perf/perf-with-kcore.sh
Simple merge

diff --cc tools/perf/util/auxtrace.c
Simple merge

diff --cc tools/perf/util/intel-pt.c
Simple merge