Merge branch 'timer-fixes-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...