From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Sat, 2 Jan 2021 09:16:32 +0000 (+0100)
Subject: Merge branches 'pm-cpufreq' and 'pm-cpuidle'
X-Git-Tag: iomap-folio-5.17-old~2338^2
X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=89ecf09e0b93de54415de45be241649ec1b162de;p=users%2Fwilly%2Flinux.git

Merge branches 'pm-cpufreq' and 'pm-cpuidle'

* pm-cpufreq:
  cpufreq: intel_pstate: Fix fast-switch fallback path

* pm-cpuidle:
  intel_idle: add SnowRidge C-state table
  MAINTAINERS: include governors into CPU IDLE TIME MANAGEMENT FRAMEWORK
---

89ecf09e0b93de54415de45be241649ec1b162de