Merge tag 'u-boot-imx-20210717' of https://gitlab.denx.de/u-boot/custodians/u-boot-imx

author Tom Rini <[email protected]>

Sat, 17 Jul 2021 14:52:21 +0000 (10:52 -0400)

committer Tom Rini <[email protected]>

Sat, 17 Jul 2021 14:52:21 +0000 (10:52 -0400)
author Tom Rini <[email protected]>
Sat, 17 Jul 2021 14:52:21 +0000 (10:52 -0400)
committer Tom Rini <[email protected]>
Sat, 17 Jul 2021 14:52:21 +0000 (10:52 -0400)
diff --cc arch/arm/dts/Makefile
Simple merge
diff --cc drivers/phy/Kconfig
Simple merge
diff --cc drivers/phy/Makefile
Simple merge
author	Tom Rini <[email protected]>
	Sat, 17 Jul 2021 14:52:21 +0000 (10:52 -0400)
committer	Tom Rini <[email protected]>
	Sat, 17 Jul 2021 14:52:21 +0000 (10:52 -0400)
		1	2
arch/arm/dts/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/phy/Kconfig	patch \|	diff1 \|	diff2 \|	blob \| history
drivers/phy/Makefile	patch \|	diff1 \|	diff2 \|	blob \| history