]> www.infradead.org Git - users/jedix/linux-maple.git/commitdiff
Merge branch 'pm-cpufreq' into linux-next
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 31 May 2021 11:57:05 +0000 (13:57 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Mon, 31 May 2021 11:57:05 +0000 (13:57 +0200)
* pm-cpufreq:
  cpufreq: intel_pstate: hybrid: Fix build with CONFIG_ACPI unset
  cpufreq: acpi-cpufreq: Skip initialization if cpufreq driver is present
  cpufreq: sc520_freq: add 'fallthrough' to one case
  cpufreq: intel_pstate: Add Cometlake support in no-HWP mode
  cpufreq: intel_pstate: Add Icelake servers support in no-HWP mode
  cpufreq: intel_pstate: hybrid: CPU-specific scaling factor
  cpufreq: intel_pstate: hybrid: Avoid exposing two global attributes


Trivial merge