Merge branches 'x86-cleanups-for-linus' and 'x86-cpufeature-for-linus' of git://git...