diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 19:57:41 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-12-08 19:57:41 +0100 |
| commit | 5aee40e4f7f321e0440b468ca8c3e006bd803cf8 (patch) | |
| tree | d489cf50efbf9b145f95ff7b4dfabc6aed8fffc2 /kernel/power | |
| parent | 5996d93054f240e994a77708b63216545e169ce1 (diff) | |
| parent | 24b5984118575ec576757df1e2f2bd74bffc9e8d (diff) | |
| parent | 471f7707b6f0b18b6aa81119ed01525d9e712427 (diff) | |
| parent | 7d3dcd042c328891a61cd69ee5a1f15a59facd1b (diff) | |
| parent | b4037aaa584bd914bbf578f5ceb2d9884fa7ddb6 (diff) | |
| download | linux-5aee40e4f7f321e0440b468ca8c3e006bd803cf8.tar.gz | |
Merge branches 'powercap', 'pm-clk', 'pm-config' and 'pm-opp'
* powercap: powercap / RAPL: fix build dependency on iosf_mbi powercap / RAPL: add new model ids powercap / RAPL: handle atom and core differences powercap / RAPL: abstract per cpu type functions * pm-clk: PM / clock_ops: make __pm_clk_enable more generic PM / clock_ops: Add pm_clk_add_clk() * pm-config: PM: Kconfig: fix unmet dependency for CPU_PM * pm-opp: PM / OPP replace kfree_rcu() with call_srcu() in opp_set_availability() PM / OPP Introduce APIs to remove OPPs PM / OPP mark OPPs as 'static' or 'dynamic' PM / OPP don't match for existing OPPs when list is empty PM / OPP rename 'head' as 'rcu_head' or 'srcu_head' based on its type