diff options
| author | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-04 01:13:34 +0400 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2014-06-04 01:13:34 +0400 |
| commit | 2e30baad228624e3868714af6ecab967c4445d4a (patch) | |
| tree | 78a033d8430f32c75223587a6b66b75cae66249e /drivers/video | |
| parent | 057beb1de54d33ecfd3397ed219b1f4518e3b470 (diff) | |
| parent | d7cddbb07b18cc45e57420005850ca0326b9e074 (diff) | |
| parent | 7ea1bdb8e162ef7b90eef2450e9a2eaefeb58d61 (diff) | |
| download | linux-2e30baad228624e3868714af6ecab967c4445d4a.tar.xz | |
Merge branches 'acpi-tools' and 'pm-tools'
* acpi-tools:
ACPI / tools: Introduce ec_access.c - tool to access the EC
* pm-tools:
cpupower: Remove mc and smt power aware scheduler info/settings
cpupower: cpupower info -b should return 0 on success, not the perf bias value
cpupower: If root, try to load msr driver on x86 if /dev/cpu/0/msr is not available
cpupower: Install recently added cpupower-idle-{set, info} manpages
cpupower: Introduce idle state disable-by-latency and enable-all
cpupower: Remove all manpages on make uninstall
cpupower: Remove dead link to homepage, and update the targets built.
cpupower: Rename cpufrequtils -> cpupower, and libcpufreq -> libcpupower.
PM / tools: cpupower: add option to display values without round offs
tools / power: turbostat: Drop temperature checks