Merge branch 'topic/timer_api' into for-linus