Merge branch 'sched/core'

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

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

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