Merge branch 'linus' into smp/urgent