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

Merge branch 'clk-imx' into clk-next

* clk-imx:
  clk: imx: imx7d: Remove ARM_M0 clock
  clk: imx: imx7d: Fix parent clock for OCRAM_CLK
  clk: imx: clk-imx6ul: allow lcdif_pre_sel to change parent rate
  clk: imx6: refine hdmi_isfr's parent to make HDMI work on i.MX6 SoCs w/o VPU
---

eed58151d606e81812448931d952ee39071d1f76