Merge branch 'x86/cpu' into perf/core, to pick up dependent changes
authorIngo Molnar <mingo@kernel.org>
Mon, 17 Jun 2019 10:29:16 +0000 (12:29 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 17 Jun 2019 10:29:16 +0000 (12:29 +0200)
commitbddb3636737f658886a0a02b64db5366bba3428e
tree8f7ffcb42803fa0bb3378ef969545e4a5e57262c
parent3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d
parentcbb99c0f588737ec98c333558922ce47e9a95827
Merge branch 'x86/cpu' into perf/core, to pick up dependent changes

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/events/intel/uncore.c
drivers/powercap/intel_rapl.c
drivers/thermal/intel/x86_pkg_temp_thermal.c
tools/perf/builtin-top.c
tools/perf/builtin-trace.c
tools/perf/perf-with-kcore.sh
tools/perf/util/auxtrace.c
tools/perf/util/intel-pt.c