Merge branch 'perf/urgent' into perf/core, to pick up fixes before applying new changes

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

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