]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-clk', 'pm-domains' and 'powercap'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jun 2015 23:18:30 +0000 (01:18 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Thu, 18 Jun 2015 23:18:30 +0000 (01:18 +0200)
commitd0eed999dd6db5295dacf59a63b52495b589fdd7
tree1782f160b71d19b154d9a034735fcad351f488dc
parent020af5dcf7d02d1038127417d8b9415465b478e4
parent0febdff24912b16a7307d14cc4112d11264f207f
parent0ba53aed2d05ac40121c48ec1da0c5df157034b1
parent515f2a78648ebdbced9ef93b4c13a17f134e9dfe
Merge branches 'pm-clk', 'pm-domains' and 'powercap'

* pm-clk:
  PM / clk: Print acquired clock name in addition to con_id
  PM / clk: Fix clock error check in __pm_clk_add()
  drivers: sh: remove boilerplate code and use USE_PM_CLK_RUNTIME_OPS
  arm: davinci: remove boilerplate code and use USE_PM_CLK_RUNTIME_OPS
  arm: omap1: remove boilerplate code and use USE_PM_CLK_RUNTIME_OPS
  arm: keystone: remove boilerplate code and use USE_PM_CLK_RUNTIME_OPS
  PM / clock_ops: Provide default runtime ops to users

* pm-domains:
  PM / Domains: Skip timings during syscore suspend/resume

* powercap:
  powercap / RAPL: Support Knights Landing
  powercap / RAPL: Floor frequency setting in Atom SoC