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

We are going to fix perf-events fallout of changes in tip:x86/cpu,
so merge in that branch first.

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

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

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

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