Merge branch 'clk-fixes' into clk-next

diff --cc drivers/clk/clk.c
Simple merge

diff --cc drivers/clk/rockchip/clk-rk3288.c
Simple merge