]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branches 'pm-sleep', 'pm-cpufreq' and 'pm-qos' into pm
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 16 Jan 2024 11:23:24 +0000 (12:23 +0100)
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>
Tue, 16 Jan 2024 11:23:24 +0000 (12:23 +0100)
* pm-sleep:
  PM: sleep: Restore asynchronous device resume optimization

* pm-cpufreq:
  Documentation: admin-guide: PM: Fix two typos
  cpufreq: intel_pstate: Update hybrid scaling factor for Meteor Lake

* pm-qos:
  PM: QoS: Use kcalloc() instead of kzalloc()


Trivial merge