From: Stephen Boyd <sboyd@codeaurora.org>
Date: Tue, 14 Nov 2017 18:07:46 +0000 (-0800)
Subject: Merge branch 'clk-uniphier' into clk-next
X-Git-Tag: v4.15-rc1~48^2~6
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=1d96ad64c945e7c28b48ed93b7a900003dc1a6fa;p=thirdparty%2Fkernel%2Flinux.git

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
---

1d96ad64c945e7c28b48ed93b7a900003dc1a6fa