Merge branch 'clk-uniphier' into clk-next
authorStephen Boyd <sboyd@codeaurora.org>
Tue, 14 Nov 2017 18:07:46 +0000 (10:07 -0800)
committerStephen Boyd <sboyd@codeaurora.org>
Tue, 14 Nov 2017 18:07:46 +0000 (10:07 -0800)
commit1d96ad64c945e7c28b48ed93b7a900003dc1a6fa
tree60df50a5495393c663f1991ca3fd0bc60a83eb8e
parente8d07fd258a4ab8be7e85de44ffa2e362b49a743
parent67affb78a4e4feb837953e3434c8402a5c3b272f
Merge branch 'clk-uniphier' into clk-next

* clk-uniphier:
  clk: uniphier: fix DAPLL2 clock rate of Pro5
  clk: uniphier: fix parent of miodmac clock data