Merge remote-tracking branch 'v4l-dvb-next/master'

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

Thu, 2 Sep 2021 00:28:31 +0000 (10:28 +1000)

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

Thu, 2 Sep 2021 00:28:31 +0000 (10:28 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 00:28:31 +0000 (10:28 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Thu, 2 Sep 2021 00:28:31 +0000 (10:28 +1000)
diff --cc MAINTAINERS
Simple merge
diff --cc drivers/media/common/videobuf2/videobuf2-core.c
Simple merge
diff --cc drivers/media/platform/atmel/atmel-isc-base.c
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 2 Sep 2021 00:28:31 +0000 (10:28 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Thu, 2 Sep 2021 00:28:31 +0000 (10:28 +1000)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/common/videobuf2/videobuf2-core.c	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/media/platform/atmel/atmel-isc-base.c	patch \|	diff1 \|	diff2 \|	blob \| history