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

diff --cc arch/alpha/kernel/perf_event.c
Simple merge

diff --cc arch/arm/kernel/perf_event.c
Simple merge

diff --cc kernel/sched.c
Simple merge

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

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

diff --cc net/core/dev.c
Simple merge

diff --cc net/core/skbuff.c
Simple merge

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

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