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)
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


Trivial merge