Merge branches 'x86-platform-for-linus' and 'x86-uv-for-linus' of git://git.kernel...