git.monstr.eu Git - linux-2.6-microblaze.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	89ecf09e0b93de54415de45be241649ec1b162de
tree	45a5733c04fc8ee2e1bfd6464185a66e187f8806	tree \| snapshot
parent	977a3b0f6e40514ccdc959cc82b1eb96b636941a	commit \| diff
parent	be1283454b61a1f3b089f1a74b73e20532262e32	commit \| diff
parent	9cf93f056f783f986c19f40d5304d1bcffa0fc0d	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