Merge commit 'linus/master' into x86/urgent