Merge branch 'next/timer-samsung' into next/clk-exynos