From: Stephen Boyd <sboyd@codeaurora.org>
Date: Tue, 14 Nov 2017 18:07:37 +0000 (-0800)
Subject: Merge branch 'clk-sunxi' into clk-next
X-Git-Tag: v4.15-rc1~48^2~14
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=3b0da91688b64290df7b6a31b515a8c903675525;p=users%2Fjedix%2Flinux-maple.git

Merge branch 'clk-sunxi' into clk-next

* clk-sunxi:
  clk: sunxi: explicitly request exclusive reset control
  clk: sunxi: fix build warning
---

3b0da91688b64290df7b6a31b515a8c903675525