From: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Date: Fri, 10 Sep 2021 18:26:08 +0000 (+0200)
Subject: Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-em'
X-Git-Tag: baikal/aarch64/sdk6.1~5787^2
X-Git-Url: https://git.baikalelectronics.ru/sdk/?a=commitdiff_plain;h=483d496fb81e45a119f9e3f1e01fe001de9da196;p=kernel.git

Merge branches 'pm-cpufreq', 'pm-sleep' and 'pm-em'

* 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
---

483d496fb81e45a119f9e3f1e01fe001de9da196