Merge branch 'perf/core'

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

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

diff --cc fs/exec.c
Simple merge

diff --cc include/trace/events/sched.h
Simple merge

diff --cc kernel/events/core.c
Simple merge

diff --cc kernel/irq/chip.c
Simple merge

diff --cc kernel/sched/core.c
Simple merge

diff --cc kernel/sched/fair.c
Simple merge

diff --cc lib/Kconfig.debug
Simple merge

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

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