Merge branch 'x86-merge' into for-linus