Merge branch 'x86/cache' into perf/core, to pick up fixes

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

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

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