Merge branch 'linus' into sched-devel