Merge branches 'powercap', 'pm-clk', 'pm-config' and 'pm-opp'

Browse source

* 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

...

This commit is contained in:

Rafael J. Wysocki 2014-12-08 19:57:41 +01:00

parent 5996d93054 24b5984118 471f7707b6 7d3dcd042c b4037aaa58

commit 5aee40e4f7

7 changed files with 405 additions and 163 deletions

Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL

Download patch file Download diff file Expand all files Collapse all files

8

include/linux/pm_clock.h

View file

12

include/linux/pm_opp.h

View file