Merge branch 'arch-timers' into for-linus