Merge branch 'linus' into sched/core, to pick up fixes

Signed-off-by: Ingo Molnar <mingo@kernel.org>

diff --cc fs/proc/array.c
Simple merge

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

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

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

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

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

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

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

diff --cc init/Kconfig
Simple merge

diff --cc kernel/sched/Makefile
Simple merge

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

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

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

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

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

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

diff --cc kernel/watchdog.c
Simple merge