Merge branch 'next-samsung-clkdev-fix' into next-samsung-devel