From: Stephen Boyd <sboyd@codeaurora.org>
Date: Tue, 21 Jun 2016 00:44:14 +0000 (-0700)
Subject: Merge branch 'clk-fixes' into clk-next
X-Git-Tag: v4.8-rc1~93^2~61
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=dd6c1331ae55fd8fb7a788524a6d93a979f714b0;p=linux.git

Merge branch 'clk-fixes' into clk-next

* clk-fixes:
  clk: Fix return value check in oxnas_stdclk_probe()
  clk: rockchip: release io resource when failing to init clk on rk3399
  clk: rockchip: fix cpuclk registration error handling
  clk: rockchip: Revert "clk: rockchip: reset init state before mmc card initialization"
  clk: rockchip: fix incorrect parent for rk3399's {c,g}pll_aclk_perihp_src
  clk: rockchip: mark rk3399 GIC clocks as critical
  clk: rockchip: initialize flags of clk_init_data in mmc-phase clock
---

dd6c1331ae55fd8fb7a788524a6d93a979f714b0