Merge branch 'clk-exynos-cpu-clk' into clk-next
authorMichael Turquette <mturquette@baylibre.com>
Sat, 20 Jun 2015 19:18:03 +0000 (12:18 -0700)
committerMichael Turquette <mturquette@baylibre.com>
Sat, 20 Jun 2015 20:26:40 +0000 (13:26 -0700)
commit85e88fab134d8896cf4d8be0aac10cc54018ee63
treecc0a6dab17bfc06837c8f6f1e1763f9490dec60e
parentddfb157444e3cdb6da18ea759730b4b4af65d3d9
parent8eb92ab68f961bb9045d8d7882cceb2d6be0659d
Merge branch 'clk-exynos-cpu-clk' into clk-next

Folded into this merge commit is a build error fix: s/clk/core in
clk_change_rate due to the new struct clk_core
drivers/clk/clk.c
include/linux/clk-provider.h