diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-02 01:43:45 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-10-02 01:43:45 +0200 |
| commit | 993eb0aeae0ff895e234cf94d1a86170584194e9 (patch) | |
| tree | 412536774ec566ae4f5310333ec0fddf820ca4c4 /mm | |
| parent | e35db92b4f53cad816af25c1a5f8be414e0de9fc (diff) | |
| parent | da4a64481b3504a6f4f07c08ff03be8f08d9638d (diff) | |
| parent | 1ad1410f632d4141221634308a5e56f339f92009 (diff) | |
| download | linux-993eb0aeae0ff895e234cf94d1a86170584194e9.tar.bz2 | |
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