Merge branch 'fixes' into for-next
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Thu, 13 Feb 2025 12:19:13 +0000 (14:19 +0200)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Thu, 13 Feb 2025 12:21:42 +0000 (14:21 +0200)
commit432c2adb9e2f84f81c4b218acb07a2cd3dce64a9
tree8fcde78af0c929468971a8967f4d4b0a51f178c2
parentbd820906ea9dc3acfcac9de4f1be89b78609e2ac
parentb3e127dacad60a384c92baafdc74f1508bf7dd47
Merge branch 'fixes' into for-next

Merge fixes into for-next to avoid int3472 and thinkpad_acpi conflicts
with upcoming changes.
drivers/platform/x86/intel/pmc/core.c
drivers/platform/x86/thinkpad_acpi.c