Merge branch 'perf/urgent' into perf/core

We cherry-picked 3 commits into perf/urgent, merge them back to allow
conflict-free work on those files.

Signed-off-by: Ingo Molnar <mingo@elte.hu>

diff --cc include/linux/perf_event.h
Simple merge

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

diff --cc tools/perf/builtin-top.c
Simple merge