Merge branches 'pm-domains', 'powercap' and 'pm-tools'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Dec 2014 20:24:00 +0000 (21:24 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 29 Dec 2014 20:24:00 +0000 (21:24 +0100)
commit4f2f2777892fdfe5f6999ae6b882ba5c0fa4bd60
tree601f8f765d4bfc78f2c1f16bd8e140f50c618e3e
parentff23ab2441e7ba5089e8631bad3a6569e7b6d5b8
parent7496fcbe8a643097efc061160e1c3b65ee2fa350
parentd72be771c5dbabaf3058ef382f4934aa31c88df2
parenta59e5109f648f703d877d3c33cc5a7ef283dba83
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
drivers/base/power/domain.c
include/linux/pm_domain.h