diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 01:18:30 +0200 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-06-19 01:18:30 +0200 |
| commit | b306976ef783188c2723ab2492fd3c0169bc8585 (patch) | |
| tree | 1782f160b71d19b154d9a034735fcad351f488dc /arch/m68k | |
| parent | 0d85fd42114ce97f209f3deb91ea0ac992c56013 (diff) | |
| parent | f17f4adfe48b64b23247b792c0e5ab998b7ab34e (diff) | |
| parent | a4630c61274322eda7c4a4d17051f7c72a9e03b1 (diff) | |
| parent | 6f066d4d2621affdbc510b5b0bd624af7ae74e1b (diff) | |
| download | linux-b306976ef783188c2723ab2492fd3c0169bc8585.tar.bz2 | |
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