Merge branch 'master' into next

author Tom Rini <trini@konsulko.com>

Mon, 21 Sep 2020 18:25:37 +0000 (14:25 -0400)

committer Tom Rini <trini@konsulko.com>

Mon, 21 Sep 2020 18:25:37 +0000 (14:25 -0400)
author Tom Rini <trini@konsulko.com>
Mon, 21 Sep 2020 18:25:37 +0000 (14:25 -0400)
committer Tom Rini <trini@konsulko.com>
Mon, 21 Sep 2020 18:25:37 +0000 (14:25 -0400)
diff --cc MAINTAINERS
Simple merge
diff --cc lib/fdtdec.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Mon, 21 Sep 2020 18:25:37 +0000 (14:25 -0400)
committer	Tom Rini <trini@konsulko.com>
	Mon, 21 Sep 2020 18:25:37 +0000 (14:25 -0400)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
lib/fdtdec.c	patch \|	diff1 \|	diff2 \|	blob \| history