Merge branch 'v3.16-samsung-clk-fixes-1' into samsung-clk-next