aboutsummaryrefslogtreecommitdiffstats
path: root/drivers
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-01-02 10:16:32 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2021-01-02 10:16:32 +0100
commit89ecf09e0b93de54415de45be241649ec1b162de (patch)
tree45a5733c04fc8ee2e1bfd6464185a66e187f8806 /drivers
parentMerge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm (diff)
parentcpufreq: intel_pstate: Fix fast-switch fallback path (diff)
parentintel_idle: add SnowRidge C-state table (diff)
downloadlinux-dev-89ecf09e0b93de54415de45be241649ec1b162de.tar.xz
linux-dev-89ecf09e0b93de54415de45be241649ec1b162de.zip
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