Merge branch 'x86/topology' into perf/core, to prepare for new patches
authorIngo Molnar <mingo@kernel.org>
Mon, 3 Jun 2019 09:58:45 +0000 (11:58 +0200)
committerIngo Molnar <mingo@kernel.org>
Mon, 3 Jun 2019 09:58:45 +0000 (11:58 +0200)
commit3384c78631dd722c2cdc5c57fbdd39fc1b5a9f2d
treee3431b09e63172968e5e4463bfffac4bf0f8fa1d
parent6a9f4efe78af6069a11946c64d3d4c86cb42046b
parenteb876fbc248e6eb4773a5bc80d205ff7262b1bb5
Merge branch 'x86/topology' into perf/core, to prepare for new patches

Signed-off-by: Ingo Molnar <mingo@kernel.org>
arch/x86/events/intel/rapl.c
arch/x86/events/intel/uncore.c
arch/x86/kernel/cpu/common.c
arch/x86/kernel/smpboot.c
drivers/hwmon/coretemp.c