summaryrefslogtreecommitdiff
path: root/drivers/base
diff options
context:
space:
mode:
authorRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-01-16 12:23:24 +0100
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2024-01-16 12:23:24 +0100
commit9223614ea760a77873c7061875cb91963e6f79b7 (patch)
tree2e41e4a705c072f4ceed7b9e0f81909bb4003b80 /drivers/base
parent7da71072e1d6967c0482abcbb5991ffb5953fdf2 (diff)
parent3e999770ac1c7c31a70685dd5b88e89473509e9c (diff)
parent03c305861c70d6db898dd2379b882e7772a5c5d0 (diff)
parent022e6f5184ff73eaaf6aa7a89b7fafc7c2bd8c9c (diff)
Merge branches 'pm-sleep', 'pm-cpufreq' and 'pm-qos' into pm
* 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()