Merge branch 'fixes' into for-next
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Sun, 11 May 2025 21:18:11 +0000 (00:18 +0300)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Sun, 11 May 2025 21:18:11 +0000 (00:18 +0300)
commit593ee93aa710ea0159f363b2f1950ecb6c9ddca2
tree806cc74dd9a3f0481f320455b0a59e21300f7958
parentf94ffc3f0b90bf4880e0abf2c056fc465e2c3be8
parentbfcfe6d335a967f8ea0c1980960e6f0205b5de6e
Merge branch 'fixes' into for-next

Resolve conflicts in dell/alienware-wmi-wmax and asus-wmi, and enable
applying a few amd/hsmp patches that depend on changes in the fixes
branch.
drivers/platform/x86/asus-wmi.c
drivers/platform/x86/dell/alienware-wmi-wmax.c
drivers/platform/x86/thinkpad_acpi.c