Merge remote-tracking branch 'mfd/for-mfd-next'

author Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 3 Jun 2021 03:29:14 +0000 (13:29 +1000)

committer Stephen Rothwell <sfr@canb.auug.org.au>

Thu, 3 Jun 2021 03:29:14 +0000 (13:29 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 03:29:14 +0000 (13:29 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 3 Jun 2021 03:29:14 +0000 (13:29 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/regulator/Kconfig
Simple merge
diff --cc sound/soc/codecs/Kconfig
Simple merge
diff --cc sound/soc/codecs/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 03:29:14 +0000 (13:29 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 3 Jun 2021 03:29:14 +0000 (13:29 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/regulator/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/codecs/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history