tree b000bfce60cc482ea543fce45eeec71c369a0478
parent d9f67dbc0f55e67dd18fc18fa05a9d5d2bd52914
parent 3bf7f56e70c9f0edb4f91cbb73a393c3b1d24801
parent d29d67357db8dad08f97162bbeb51e4975ee67fd
author Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1447978930 +0100
committer Rafael J. Wysocki <rafael.j.wysocki@intel.com> 1447978930 +0100

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