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

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

Wed, 2 Jun 2021 23:59:44 +0000 (09:59 +1000)

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

Wed, 2 Jun 2021 23:59:44 +0000 (09:59 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Jun 2021 23:59:44 +0000 (09:59 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Wed, 2 Jun 2021 23:59:44 +0000 (09:59 +1000)
diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc arch/m68k/Makefile
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 2 Jun 2021 23:59:44 +0000 (09:59 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Wed, 2 Jun 2021 23:59:44 +0000 (09:59 +1000)
		1	2
.mailmap	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/m68k/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history