summaryrefslogtreecommitdiffstats
path: root/kernel/power
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-08 20:00:02 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-08 20:00:02 +0100
commit389cbf36e50a62c6ea6430c576b5f31ab7ccfae6 (patch)
tree7ede864cb59a592ebcf61caaff70ccaa631c5f76 /kernel/power
parentMerge branches 'powercap', 'pm-clk', 'pm-config' and 'pm-opp' (diff)
parentARM: shmobile: Convert to genpd flags for PM clocks for R-mobile (diff)
parentPM / hibernate: Deletion of an unnecessary check before the function call "vf... (diff)
parenttools: cpupower: fix return checks for sysfs_get_idlestate_count() (diff)
downloadlinux-389cbf36e50a62c6ea6430c576b5f31ab7ccfae6.tar.xz
linux-389cbf36e50a62c6ea6430c576b5f31ab7ccfae6.zip
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()