Merge remote-tracking branch 'sound-asoc/for-next'

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

Wed, 14 Apr 2021 03:43:19 +0000 (13:43 +1000)

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

Wed, 14 Apr 2021 03:43:19 +0000 (13:43 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:43:19 +0000 (13:43 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 14 Apr 2021 03:43:19 +0000 (13:43 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc sound/soc/ti/ams-delta.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 03:43:19 +0000 (13:43 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 14 Apr 2021 03:43:19 +0000 (13:43 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
sound/soc/ti/ams-delta.c	patch \|	diff1 \|	diff2 \|	blob \| history