Merge branch 'clk-rockchip' of git://git.linaro.org/people/mike.turquette/linux into...