Merge branch 'next'

author Tom Rini <[email protected]>

Mon, 5 Apr 2021 15:29:57 +0000 (11:29 -0400)

committer Tom Rini <[email protected]>

Mon, 5 Apr 2021 15:29:57 +0000 (11:29 -0400)
author Tom Rini <[email protected]>
Mon, 5 Apr 2021 15:29:57 +0000 (11:29 -0400)
committer Tom Rini <[email protected]>
Mon, 5 Apr 2021 15:29:57 +0000 (11:29 -0400)
diff --cc Makefile
Simple merge
diff --cc cmd/Kconfig
Simple merge
author	Tom Rini <[email protected]>
	Mon, 5 Apr 2021 15:29:57 +0000 (11:29 -0400)
committer	Tom Rini <[email protected]>
	Mon, 5 Apr 2021 15:29:57 +0000 (11:29 -0400)
		1	2
Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
cmd/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history