Merge tag 'v4.9-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Wed, 14 Sep 2016 22:13:48 +0000 (00:13 +0200)
committerArnd Bergmann <arnd@arndb.de>
Wed, 14 Sep 2016 22:13:48 +0000 (00:13 +0200)
commit132166589c670cd9f9a8ac7b3676f72fff35d81b
tree5c9dc4487863f6cc789206c8db7d9cbca27a5478
parentf5895b53d41499434160865f405f8ddfa1810380
parent6f27ab3e424a9532fd8e36c8732abb38eb0da993
Merge tag 'v4.9-rockchip-drivers1' of git://git./linux/kernel/git/mmind/linux-rockchip into next/drivers

Pull "Rockchip driver changes for 4.9" from Heiko Stübner:

This enables the active-wakeup functionality of the generic power-domains
for the rockchip power-domain driver, so that some domains can stay
active during suspend.

* tag 'v4.9-rockchip-drivers1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  soc: rockchip: support active_wakeup for rockchip power-domains