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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/include/asm/perf_event.h
Simple merge

diff --cc arch/x86/kernel/cpu/perf_event.c
Simple merge

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

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

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

diff --cc kernel/perf_event.c
Simple merge

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

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

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

diff --cc mm/slub.c
Simple merge