Merge branch 'perf/urgent' into perf/core

Merge reason: We want to apply a dependent patch.

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

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

diff --cc kernel/perf_event.c
Simple merge

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

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

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