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

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

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

diff --cc arch/x86/events/msr.c
Simple merge