Merge branch 'perf/urgent' into perf/core

Merge reason: Resolve patch dependency

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 kernel/sched.c
Simple merge