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