Merge branches 'pm-cpufreq' and 'pm-cpuidle'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 2 Jan 2021 09:16:32 +0000 (10:16 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Sat, 2 Jan 2021 09:16:32 +0000 (10:16 +0100)
* 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

1  2  3 
MAINTAINERS

diff --cc MAINTAINERS
Simple merge