diff options
author | 2014-12-29 21:24:00 +0100 | |
---|---|---|
committer | 2014-12-29 21:24:00 +0100 | |
commit | 4f2f2777892fdfe5f6999ae6b882ba5c0fa4bd60 (patch) | |
tree | 601f8f765d4bfc78f2c1f16bd8e140f50c618e3e /drivers/base/power | |
parent | Merge branches 'pm-cpufreq' and 'pm-cpuidle' (diff) | |
parent | PM / Domains: Export of_genpd_get_from_provider function (diff) | |
parent | powercap / RAPL: add IDs for future Xeon CPUs (diff) | |
parent | tools / cpupower: Fix no idle state information return value (diff) | |
download | linux-4f2f2777892fdfe5f6999ae6b882ba5c0fa4bd60.tar.gz linux-4f2f2777892fdfe5f6999ae6b882ba5c0fa4bd60.tar.bz2 linux-4f2f2777892fdfe5f6999ae6b882ba5c0fa4bd60.zip |
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