Merge mainline/master into arm/fixes

author Olof Johansson <[email protected]>

Thu, 5 Dec 2019 21:16:58 +0000 (13:16 -0800)

committer Olof Johansson <[email protected]>

Thu, 5 Dec 2019 21:18:54 +0000 (13:18 -0800)
author Olof Johansson <[email protected]>
Thu, 5 Dec 2019 21:16:58 +0000 (13:16 -0800)
committer Olof Johansson <[email protected]>
Thu, 5 Dec 2019 21:18:54 +0000 (13:18 -0800)
diff --cc .mailmap
Simple merge
diff --cc MAINTAINERS
Simple merge
diff --cc arch/arm/mach-pxa/icontrol.c
Simple merge
author	Olof Johansson <[email protected]>
	Thu, 5 Dec 2019 21:16:58 +0000 (13:16 -0800)
committer	Olof Johansson <[email protected]>
	Thu, 5 Dec 2019 21:18:54 +0000 (13:18 -0800)
		1	2
.mailmap	patch \|	diff1 \|	diff2 \|	blob \| history
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
arch/arm/mach-pxa/icontrol.c	patch \|	diff1 \|	diff2 \|	blob \| history