diff options
author | 2015-03-06 01:29:31 +0100 | |
---|---|---|
committer | 2015-03-06 01:29:31 +0100 | |
commit | e178e7d6df38dab67f51df4282927c4c7392879f (patch) | |
tree | fe77ab4e3815f73ae92dc535a2fba0640bb0594e /drivers/base/power | |
parent | Merge branch 'acpi-video' (diff) | |
parent | PM / Domains: cleanup: rename gpd -> genpd in debugfs interface (diff) | |
parent | cpufreq: ppc: Add missing #include <asm/smp.h> (diff) | |
download | linux-e178e7d6df38dab67f51df4282927c4c7392879f.tar.gz linux-e178e7d6df38dab67f51df4282927c4c7392879f.tar.bz2 linux-e178e7d6df38dab67f51df4282927c4c7392879f.zip |
Merge branches 'pm-domains' and 'pm-cpufreq'
* pm-domains:
PM / Domains: cleanup: rename gpd -> genpd in debugfs interface
* pm-cpufreq:
cpufreq: ppc: Add missing #include <asm/smp.h>