Merge branch 'tip/sched/urgent'

Avoid merge conflicts

Signed-off-by: Peter Zijlstra <peterz@infradead.org>

diff --cc MAINTAINERS
Simple merge

diff --cc arch/x86/kernel/smpboot.c
Simple merge

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

diff --cc init/Kconfig
Simple merge

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

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

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

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

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