tree 412536774ec566ae4f5310333ec0fddf820ca4c4
parent e35db92b4f53cad816af25c1a5f8be414e0de9fc
parent da4a64481b3504a6f4f07c08ff03be8f08d9638d
parent 1ad1410f632d4141221634308a5e56f339f92009
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1475365425 +0200
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1475365425 +0200

Merge branches 'pm-devfreq' and 'pm-sleep'

* pm-devfreq:
  PM / devfreq: rk3399_dmc: Remove explictly regulator_put call in .remove
  PM / devfreq: rockchip: add PM_DEVFREQ_EVENT dependency
  partial revert of "PM / devfreq: Add COMPILE_TEST for build coverage"
  PM / devfreq: rockchip: add devfreq driver for rk3399 dmc
  Documentation: bindings: add dt documentation for rk3399 dmc
  PM / devfreq: event: support rockchip dfi controller
  Documentation: bindings: add dt documentation for dfi controller
  PM / devfreq: event: remove duplicate devfreq_event_get_drvdata()
  PM / devfreq: fix Kconfig indent style
  PM / devfreq: Add COMPILE_TEST for build coverage
  PM / devfreq: exynos-ppmu: remove unneeded of_node_put()

* pm-sleep:
  PM / Hibernate: allow hibernation with PAGE_POISONING_ZERO
  PM / sleep: enable suspend-to-idle even without registered suspend_ops
  PM / sleep: Increase default DPM watchdog timeout to 120