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)
commitbe2d24336f8876d60d8a4634f1a1e4753c4be124
tree88871a0990713f3e0b543d8efbd86f3ef686b892
parent3d53afea525f5812da782624014e7910ba731b34
parent46573fd6369f098f15e11768850b6430f374905f
parent4a9344cd0aa4499beb3772bbecb40bb78888c0e1
parentd62aab8ff711dc3a4c07684ea33042347f79b630
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