diff options
| author |   Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-20 01:22:10 +0100 |
|---|---|---|
| committer | Rafael J. Wysocki <rafael.j.wysocki@intel.com> | 2015-11-20 01:22:10 +0100 |
| commit | 9832bf3a35f55b8650280a6a3236859e751a1294 (patch) | |
| tree | b000bfce60cc482ea543fce45eeec71c369a0478 /drivers | |
| parent | Merge branch 'pm-tools' (diff) | |
| parent | Revert "Documentation: kernel_parameters for Intel P state driver" (diff) | |
| parent | ACPI / CPPC: Use h/w reduced version of the PCCT structure (diff) | |
| download | linux-dev-9832bf3a35f55b8650280a6a3236859e751a1294.tar.xz linux-dev-9832bf3a35f55b8650280a6a3236859e751a1294.zip | |
Merge branches 'pm-cpufreq' and 'acpi-cppc'
* pm-cpufreq:
Revert "Documentation: kernel_parameters for Intel P state driver"
cpufreq: mediatek: fix build error
cpufreq: intel_pstate: Add separate support for Airmont cores
cpufreq: intel_pstate: Replace BYT with ATOM
Revert "cpufreq: intel_pstate: Use ACPI perf configuration"
Revert "cpufreq: intel_pstate: Avoid calculation for max/min"
* acpi-cppc:
ACPI / CPPC: Use h/w reduced version of the PCCT structure