Merge remote-tracking branch 'arm-soc/for-next'

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

Tue, 13 Apr 2021 23:27:41 +0000 (09:27 +1000)

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

Tue, 13 Apr 2021 23:27:41 +0000 (09:27 +1000)
author Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Apr 2021 23:27:41 +0000 (09:27 +1000)
committer Stephen Rothwell <sfr@canb.auug.org.au>
Tue, 13 Apr 2021 23:27:41 +0000 (09:27 +1000)
diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/Kconfig
Simple merge
diff --cc arch/arm64/configs/defconfig
Simple merge
diff --cc arch/arm64/include/asm/sysreg.h
Simple merge
diff --cc include/linux/cpuhotplug.h
Simple merge
author	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Apr 2021 23:27:41 +0000 (09:27 +1000)
committer	Stephen Rothwell <sfr@canb.auug.org.au>
	Tue, 13 Apr 2021 23:27:41 +0000 (09:27 +1000)
		1	2
.mailmap	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/configs/defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm64/include/asm/sysreg.h	patch \|	diff1 \|	diff2 \|	blob \| history
include/linux/cpuhotplug.h	patch \|	diff1 \|	diff2 \|	blob \| history