From: Olof Johansson <olof@lixom.net>
Date: Sat, 29 Oct 2016 18:09:37 +0000 (-0700)
Subject: Merge tag 'v4.9-rockchip-dts64-fixes1' of git://git.kernel.org/pub/scm/linux/kernel... 
X-Git-Tag: v4.9-rc3~3^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=b70e8beb09d313202afd9d3953f501f02ee4e44b;p=users%2Fdwmw2%2Flinux.git

Merge tag 'v4.9-rockchip-dts64-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip into fixes

Correct regulator handling on Rockchip arm64 boards to make
bind/unbind calls work correctly and remove a sdio-only
property from non-sdio mmc hosts, that accidentially was
added there.

* tag 'v4.9-rockchip-dts64-fixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  arm64: dts: rockchip: remove the abuse of keep-power-in-suspend
  arm64: dts: rockchip: remove always-on and boot-on from vcc_sd

Signed-off-by: Olof Johansson <olof@lixom.net>
---

b70e8beb09d313202afd9d3953f501f02ee4e44b