From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Thu, 18 Jun 2015 23:18:30 +0000 (+0200)
Subject: Merge branches 'pm-clk', 'pm-domains' and 'powercap'
X-Git-Tag: omap-for-v4.2/fixes-rc1^2~154^2~4
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b306976ef783188c2723ab2492fd3c0169bc8585;p=pandora-kernel.git

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
---

b306976ef783188c2723ab2492fd3c0169bc8585
Reading git-diff-tree failed