summaryrefslogtreecommitdiff
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-14 21:58:57 (GMT)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2015-12-14 21:58:57 (GMT)
commitf1b9fc591e437ec07626ba84e1d81be19cb00eb6 (patch)
tree0e73c125aa10ad42900e4b799d19985116487c8d /drivers
parent9f9499ae8e6415cefc4fe0a96ad0e27864353c89 (diff)
parent79a21dbfae3cd40d5a801778071a9967b79c2c20 (diff)
parent88b7b7c0c2ba2c1f2c589ee883050717fe91af22 (diff)
parentffe12855a5f7f195589130197558e6a5c276caa4 (diff)
downloadlinux-f1b9fc591e437ec07626ba84e1d81be19cb00eb6.tar.xz
Merge branches 'powercap', 'pm-cpufreq' and 'pm-domains'
* powercap: powercap / RAPL: fix BIOS lock check * pm-cpufreq: cpufreq: intel_pstate: Minor cleanup for FRAC_BITS cpufreq: tegra: add regulator dependency for T124 * pm-domains: PM / Domains: Allow runtime PM callbacks to be re-used during system PM