Merge branch 'perf/urgent' into perf/core, to avoid conflicts

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

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/hrtimer.c
Simple merge