tree 60df50a5495393c663f1991ca3fd0bc60a83eb8e
parent e8d07fd258a4ab8be7e85de44ffa2e362b49a743
parent 67affb78a4e4feb837953e3434c8402a5c3b272f
author Stephen Boyd <sboyd@codeaurora.org> 1510682866 -0800
committer Stephen Boyd <sboyd@codeaurora.org> 1510682866 -0800

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