Merge branches 'sched/cleanups' and 'linus' into sched/core