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