Merge branch 'next'

author Tom Rini <[email protected]>

Mon, 8 Jan 2024 17:00:18 +0000 (12:00 -0500)

committer Tom Rini <[email protected]>

Mon, 8 Jan 2024 17:00:18 +0000 (12:00 -0500)
author Tom Rini <[email protected]>
Mon, 8 Jan 2024 17:00:18 +0000 (12:00 -0500)
committer Tom Rini <[email protected]>
Mon, 8 Jan 2024 17:00:18 +0000 (12:00 -0500)
diff --cc MAINTAINERS
Simple merge
diff --cc Makefile
Simple merge
author	Tom Rini <[email protected]>
	Mon, 8 Jan 2024 17:00:18 +0000 (12:00 -0500)
committer	Tom Rini <[email protected]>
	Mon, 8 Jan 2024 17:00:18 +0000 (12:00 -0500)
		1	2
MAINTAINERS	patch \|	diff1 \|	diff2 \|	blob \| history
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history