Merge commit 'linus/master' into sched-fixes-for-linus