Merge tag 'v4.7-rockchip-drivers-2' of git://git.kernel.org/pub/scm/linux/kernel...
authorArnd Bergmann <arnd@arndb.de>
Mon, 9 May 2016 14:17:16 +0000 (16:17 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 9 May 2016 14:17:16 +0000 (16:17 +0200)
commitf0653f6768ee9d66e25b2476facb74c9c2d88118
treeb9db61afb15386a2026e57bf9b49865a60d881c8
parent036dae83b9e0ec355a5b9341dec06214bff5b472
parent074c6a422d86fff76e05cf31be25e0eb752e1bd4
Merge tag 'v4.7-rockchip-drivers-2' of git://git./linux/kernel/git/mmind/linux-rockchip into next/drivers

Merge "Rockchip driver updates for v4.7 - part2" from Heiko Stübner:

Ability to save and restore the power-domain quality of service
settings that get lost and reset on power-domain power cycles.

* tag 'v4.7-rockchip-drivers-2' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip:
  soc: rockchip: power-domain: support qos save and restore
  dt-bindings: modify document of Rockchip power domains