Merge branch 'perf/urgent' into perf/core, to pick up fixes and to refresh the tree

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

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

diff --cc tools/perf/util/annotate.c
Simple merge