Merge branches 'x86-reboot-for-linus' and 'x86-setup-for-linus' of git://git.kernel...