Merge branch 'ib-mfd-input-regulator-6.11' into ibs-for-mfd-merged

author Lee Jones <lee@kernel.org>

Thu, 4 Jul 2024 16:06:42 +0000 (17:06 +0100)

committer Lee Jones <lee@kernel.org>

Thu, 4 Jul 2024 16:06:42 +0000 (17:06 +0100)
author Lee Jones <lee@kernel.org>
Thu, 4 Jul 2024 16:06:42 +0000 (17:06 +0100)
committer Lee Jones <lee@kernel.org>
Thu, 4 Jul 2024 16:06:42 +0000 (17:06 +0100)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/input/misc/Kconfig
Simple merge
diff --cc drivers/input/misc/Makefile
Simple merge
diff --cc drivers/mfd/Kconfig
Simple merge
diff --cc drivers/mfd/Makefile
Simple merge
author	Lee Jones <lee@kernel.org>
	Thu, 4 Jul 2024 16:06:42 +0000 (17:06 +0100)
committer	Lee Jones <lee@kernel.org>
	Thu, 4 Jul 2024 16:06:42 +0000 (17:06 +0100)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/input/misc/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/mfd/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history