]> www.infradead.org Git - users/dwmw2/linux.git/commit
Merge branch 'fixes' into 'for-next'
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 20 Jan 2025 12:22:06 +0000 (14:22 +0200)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Tue, 21 Jan 2025 12:00:38 +0000 (14:00 +0200)
commit0da9a3f9ac8ada83fa79579455871ec59f11db72
tree48a22c56221b8c9b3639cf132330117baf2c5181
parent3ef4ea516c2f8a2f1ff8ca59b156fb2e4472c2a4
parent59616a91e5e74833b2008b56c66879857c616006
Merge branch 'fixes' into 'for-next'

Merged the 'fixes' branch into the 'for-next' branch to resolve
a conflict in alienware-wmi zone teardown code.
drivers/platform/x86/amd/pmc/pmc.c
drivers/platform/x86/asus-nb-wmi.c
drivers/platform/x86/asus-wmi.c
drivers/platform/x86/dell/alienware-wmi.c
drivers/platform/x86/dell/dell-uart-backlight.c
drivers/platform/x86/hp/hp-wmi.c
drivers/platform/x86/intel/pmc/core_ssram.c
drivers/platform/x86/intel/tpmi_power_domains.c
drivers/platform/x86/intel/vsec.c
drivers/platform/x86/thinkpad_acpi.c