summaryrefslogtreecommitdiffstats
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-19 01:18:30 +0200
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-06-19 01:18:30 +0200
commitb306976ef783188c2723ab2492fd3c0169bc8585 (patch)
tree1782f160b71d19b154d9a034735fcad351f488dc /drivers/base
parentMerge branch 'pm-wakeirq' (diff)
parentPM / clk: Print acquired clock name in addition to con_id (diff)
parentPM / Domains: Skip timings during syscore suspend/resume (diff)
parentpowercap / RAPL: Support Knights Landing (diff)
downloadlinux-b306976ef783188c2723ab2492fd3c0169bc8585.tar.xz
linux-b306976ef783188c2723ab2492fd3c0169bc8585.zip
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