Merge branch 'perf/urgent' into perf/core

Merge reason: queue up dependent patch, update to -rc4

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

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

diff --cc include/trace/ftrace.h
Simple merge

diff --cc init/Kconfig
Simple merge

diff --cc kernel/perf_event.c
Simple merge

diff --cc kernel/sched.c
Simple merge

diff --cc kernel/trace/trace_kprobe.c
Simple merge

diff --cc tools/perf/Makefile
Simple merge

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