Merge tag 'clk-fixes-for-linus' of git://git.linaro.org/people/mike.turquette/linux