]> git.ipfire.org Git - thirdparty/linux.git/commit
Merge branch 'fixes' into 'for-next'
authorIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 21 Jul 2025 13:37:27 +0000 (16:37 +0300)
committerIlpo Järvinen <ilpo.jarvinen@linux.intel.com>
Mon, 21 Jul 2025 13:37:27 +0000 (16:37 +0300)
commitb5f20799f164053a0fbf7c61b3c99f8cf9cf0656
tree6aaa08ee1e8ef13313bb5785b1a0343b7576f69e
parent6e38b9fcbfa3053e1b5d2806a7233078d712bd34
parente2967b50b709970547b5cdfa1b42526835327f36
Merge branch 'fixes' into 'for-next'

Merge the fixes branch into the for-next branch to resolve Makefile
conflict and include the power supply accessor work that is required
by the upcoming Uniwill driver.
MAINTAINERS
drivers/platform/x86/Makefile
drivers/platform/x86/dell/alienware-wmi-wmax.c
drivers/platform/x86/lenovo/ideapad-laptop.c
drivers/platform/x86/lenovo/wmi-hotkey-utilities.c