]> git.baikalelectronics.ru Git - kernel.git/commitdiff
projects / kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 638bbc4 e79963b c95f5ba ca6bc6e)
Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-em'
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 10 Sep 2021 18:26:08 +0000 (20:26 +0200)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Fri, 10 Sep 2021 18:26:08 +0000 (20:26 +0200)
* pm-cpufreq:
  cpufreq: intel_pstate: hybrid: Rework HWP calibration
  ACPI: CPPC: Introduce cppc_get_nominal_perf()

* pm-sleep:
  PM: sleep: core: Avoid setting power.must_resume to false
  PM: sleep: wakeirq: drop useless parameter from dev_pm_attach_wake_irq()

* pm-em:
  Documentation: power: include kernel-doc in Energy Model doc
  PM: EM: fix kernel-doc comments


Trivial merge
Linux Kernel Source Tree.