]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branches 'pm-cpufreq' and 'acpi-cppc'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 20 Nov 2015 00:22:10 +0000 (01:22 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 20 Nov 2015 00:22:10 +0000 (01:22 +0100)
commit8471d15acefc9fe7e145bcaf1c247f6daeb114cd
treeb000bfce60cc482ea543fce45eeec71c369a0478
parentbfdcaea946a29380f65dab4f8896c4013cecb4b1
parenta706bc5c37a5361754362256a254cb8f9e0b25fc
parentc40ef67dcdb748ca6a71cbd92c9def509d33bc0c
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
Documentation/kernel-parameters.txt
drivers/acpi/cppc_acpi.c
drivers/cpufreq/Kconfig.arm