Merge branch 'ux500/timers' into next/timer