diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 14:45:27 +0300 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2016-07-25 14:45:27 +0300 |
| commit | fa70db3f19a183af5334edea5ad9e417c58faa5c (patch) | |
| tree | a4d12c0c132e225783e38822e97039227634c164 /drivers/powercap/intel_rapl.c | |
| parent | dbac75468eef385dc8d4bf9927a7547a17edb416 (diff) | |
| parent | fe7450b05fddebd5a76a5ad280a5ae9a82ce336f (diff) | |
| parent | 498b5fdd40dd3881a3119d11bff8441cfd902850 (diff) | |
| parent | 7eb231c337e00735d4b553ed4ae7f9441598f028 (diff) | |
| parent | 6ec39cf5cd6f77e3ff9ff1da75b758a47f939888 (diff) | |
| download | linux-fa70db3f19a183af5334edea5ad9e417c58faa5c.tar.xz | |
Merge branches 'pm-core', 'pm-clk', 'pm-domains' and 'pm-pci'
* pm-core:
PM / runtime: Asynchronous "idle" in pm_runtime_allow()
PM / runtime: print error when activating a child to unactive parent
* pm-clk:
PM / clk: Add support for adding a specific clock from device-tree
PM / clk: export symbols for existing pm_clk_<...> API fcns
* pm-domains:
PM / Domains: Convert pm_genpd_init() to return an error code
PM / Domains: Stop/start devices during system PM suspend/resume in genpd
PM / Domains: Allow runtime PM during system PM phases
PM / Runtime: Avoid resuming devices again in pm_runtime_force_resume()
PM / Domains: Remove redundant pm_request_idle() call in genpd
PM / Domains: Remove redundant wrapper functions for system PM
PM / Domains: Allow genpd to power on during system PM phases
* pm-pci:
PCI / PM: check all fields in pci_set_platform_pm()