Merge branch 'tip/perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

Conflicts:
	include/linux/perf_event.h

Merge reason: pick up the latest jump-label enhancements, they are cooked ready.

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

diff --cc include/asm-generic/vmlinux.lds.h
Simple merge

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

diff --cc kernel/perf_event.c
Simple merge

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