Merge tag 'platform-drivers-x86-v6.8-4' into pdx86/for-next
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Tue, 12 Mar 2024 10:51:10 +0000 (12:51 +0200)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Tue, 12 Mar 2024 10:51:10 +0000 (12:51 +0200)
commit1c0a50de025d0d52825dfa5d7749c56ad6c4fa00
tree4afe7988034d8272e19d72c5c563faa44b12e7dc
parent30f96b2cb70d882515efae4d4af698f18a65c75e
parent0314cebb29be2f961abb37bd0b01cb16899868f2
Merge tag 'platform-drivers-x86-v6.8-4' into pdx86/for-next

Merge tag 'platform-drivers-x86-v6.8-4' fixes into pdx86/for-next to
resolve amd/pmf conflicts.
drivers/platform/x86/amd/pmf/core.c
drivers/platform/x86/amd/pmf/pmf.h
drivers/platform/x86/amd/pmf/tee-if.c
drivers/platform/x86/think-lmi.c
drivers/platform/x86/thinkpad_acpi.c
drivers/platform/x86/touchscreen_dmi.c