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)
Merge fixes into for-next to avoid int3472 and thinkpad_acpi conflicts
with upcoming changes.

1  2 
drivers/platform/x86/intel/pmc/core.c
drivers/platform/x86/thinkpad_acpi.c

Simple merge
Simple merge