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
Showing
- drivers/base/power/domain.c 2 additions, 1 deletiondrivers/base/power/domain.c
- drivers/powercap/intel_rapl.c 1 addition, 0 deletionsdrivers/powercap/intel_rapl.c
- include/linux/pm_domain.h 8 additions, 0 deletionsinclude/linux/pm_domain.h
- tools/power/cpupower/utils/cpupower.c 1 addition, 1 deletiontools/power/cpupower/utils/cpupower.c
- tools/power/cpupower/utils/helpers/sysfs.c 1 addition, 1 deletiontools/power/cpupower/utils/helpers/sysfs.c
Loading
Please register or sign in to comment