Merge branch 'next'

author Tom Rini <trini@konsulko.com>

Mon, 3 Oct 2022 19:39:46 +0000 (15:39 -0400)

committer Tom Rini <trini@konsulko.com>

Mon, 3 Oct 2022 19:39:46 +0000 (15:39 -0400)
author Tom Rini <trini@konsulko.com>
Mon, 3 Oct 2022 19:39:46 +0000 (15:39 -0400)
committer Tom Rini <trini@konsulko.com>
Mon, 3 Oct 2022 19:39:46 +0000 (15:39 -0400)
diff --cc Makefile
Simple merge
diff --cc common/board_r.c
Simple merge
author	Tom Rini <trini@konsulko.com>
	Mon, 3 Oct 2022 19:39:46 +0000 (15:39 -0400)
committer	Tom Rini <trini@konsulko.com>
	Mon, 3 Oct 2022 19:39:46 +0000 (15:39 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
common/board_r.c	patch \|	diff1 \|	diff2 \|	blob \| history