Merge branch 'master' of git://git.denx.de/u-boot

author Stefano Babic <[email protected]>

Thu, 21 Oct 2021 11:57:38 +0000 (13:57 +0200)

committer Stefano Babic <[email protected]>

Thu, 21 Oct 2021 11:58:13 +0000 (13:58 +0200)
author Stefano Babic <[email protected]>
Thu, 21 Oct 2021 11:57:38 +0000 (13:57 +0200)
committer Stefano Babic <[email protected]>
Thu, 21 Oct 2021 11:58:13 +0000 (13:58 +0200)
diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc configs/colibri-imx6ull_defconfig
Simple merge
diff --cc include/configs/colibri-imx6ull.h
Simple merge
author	Stefano Babic <[email protected]>
	Thu, 21 Oct 2021 11:57:38 +0000 (13:57 +0200)
committer	Stefano Babic <[email protected]>
	Thu, 21 Oct 2021 11:58:13 +0000 (13:58 +0200)
		1	2
arch/arm/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
configs/colibri-imx6ull_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/colibri-imx6ull.h	patch \|	diff1 \|	diff2 \|	blob \| history