]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commit
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)
commit89ecf09e0b93de54415de45be241649ec1b162de
tree45a5733c04fc8ee2e1bfd6464185a66e187f8806
parent977a3b0f6e40514ccdc959cc82b1eb96b636941a
parentbe1283454b61a1f3b089f1a74b73e20532262e32
parent9cf93f056f783f986c19f40d5304d1bcffa0fc0d
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
MAINTAINERS