summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-29 21:24:00 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2014-12-29 21:24:00 +0100
commit4f2f2777892fdfe5f6999ae6b882ba5c0fa4bd60 (patch)
tree601f8f765d4bfc78f2c1f16bd8e140f50c618e3e
parentff23ab2441e7ba5089e8631bad3a6569e7b6d5b8 (diff)
parent7496fcbe8a643097efc061160e1c3b65ee2fa350 (diff)
parentd72be771c5dbabaf3058ef382f4934aa31c88df2 (diff)
parenta59e5109f648f703d877d3c33cc5a7ef283dba83 (diff)
Merge branches 'pm-domains', 'powercap' and 'pm-tools'
* pm-domains: PM / Domains: Export of_genpd_get_from_provider function * powercap: powercap / RAPL: add IDs for future Xeon CPUs * pm-tools: tools / cpupower: Fix no idle state information return value tools / cpupower: Correctly detect if running as root