Merge branch 'clk-fixes' into clk-next

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

diff --cc drivers/clk/qcom/lcc-ipq806x.c
Simple merge