diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-06 01:29:31 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-03-06 01:29:31 +0100 |
| commit | e178e7d6df38dab67f51df4282927c4c7392879f (patch) | |
| tree | fe77ab4e3815f73ae92dc535a2fba0640bb0594e /Documentation | |
| 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-dev-e178e7d6df38dab67f51df4282927c4c7392879f.tar.xz linux-dev-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>