Merge branch 'next'
authorTom Rini <trini@konsulko.com>
Mon, 5 Apr 2021 15:29:57 +0000 (11:29 -0400)
committerTom Rini <trini@konsulko.com>
Mon, 5 Apr 2021 15:29:57 +0000 (11:29 -0400)
1  2 
Makefile
cmd/Kconfig

diff --cc Makefile
Simple merge
diff --cc cmd/Kconfig
Simple merge