git.baikalelectronics.ru Git - kernel.git/commit

author	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Sat, 2 Jan 2021 09:16:32 +0000 (10:16 +0100)
committer	Rafael J. Wysocki <rafael.j.wysocki@intel.com>
	Sat, 2 Jan 2021 09:16:32 +0000 (10:16 +0100)
commit	e8d94f74dd406b38437993c65dd8e5dde94d2b83
tree	45a5733c04fc8ee2e1bfd6464185a66e187f8806	tree \| snapshot
parent	50737efbacdfad7a85aa3612049799b753163628	commit \| diff
parent	ac0f568bddc68ca9b0d3ebd29dc55ef5006825f7	commit \| diff
parent	19a69367d9fb2ab621935d27fe895ea02da153c0	commit \| diff

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