diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 20:00:02 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 20:00:02 +0100 |
| commit | 389cbf36e50a62c6ea6430c576b5f31ab7ccfae6 (patch) | |
| tree | 7ede864cb59a592ebcf61caaff70ccaa631c5f76 /kernel | |
| parent | 5aee40e4f7f321e0440b468ca8c3e006bd803cf8 (diff) | |
| parent | cffa91380d6dd29befe7608e052693698b78dc9c (diff) | |
| parent | 6c45de0d51a3d93267ee100bff8c4632b1d49e8f (diff) | |
| parent | 16b7c275c055cc36218404b5d147be7f76575087 (diff) | |
Merge branches 'pm-domains', 'pm-sleep' and 'pm-tools'
* pm-domains:
ARM: shmobile: Convert to genpd flags for PM clocks for R-mobile
ARM: shmobile: Convert to genpd flags for PM clocks for r8a7779
PM / Domains: Initial PM clock support for genpd
PM / Domains: Power on the PM domain right after attach completes
PM / Domains: Move struct pm_domain_data to pm_domain.h
PM / Domains: Extract code to power off/on a PM domain
PM / Domains: Make genpd parameter of pm_genpd_present() const
* pm-sleep:
PM / hibernate: Deletion of an unnecessary check before the function call "vfree"
PM / Hibernate: Migrate to ktime_t
* pm-tools:
tools: cpupower: fix return checks for sysfs_get_idlestate_count()