Merge branches 'timers-urgent-for-linus' and 'x86-urgent-for-linus' of git://git...