From: Stephen Boyd <sboyd@codeaurora.org>
Date: Thu, 26 Jan 2017 23:52:37 +0000 (-0800)
Subject: Merge branch 'clk-imx7', 'clk-bcm2835' into clk-next
X-Git-Tag: iommu-fix-v4.11-rc0-2~17^2~33
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=645ebb1daa6c7d26a0ad5c7e919e3ed907956a51;p=users%2Fdwmw2%2Flinux.git

Merge branch 'clk-imx7', 'clk-bcm2835' into clk-next

* clk-imx7:
  clk: imx7d: Add the OCOTP clock

* clk-bcm2835:
  clk: bcm2835: Add leaf clock measurement support, disabled by default
  clk: bcm2835: Register the DSI0/DSI1 pixel clocks.
  clk: bcm2835: Don't rate change PLLs on behalf of DSI PLL dividers.
---

645ebb1daa6c7d26a0ad5c7e919e3ed907956a51