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

author Tom Rini <[email protected]>

Tue, 4 Sep 2018 21:45:53 +0000 (17:45 -0400)

committer Tom Rini <[email protected]>

Tue, 4 Sep 2018 21:45:53 +0000 (17:45 -0400)
author Tom Rini <[email protected]>
Tue, 4 Sep 2018 21:45:53 +0000 (17:45 -0400)
committer Tom Rini <[email protected]>
Tue, 4 Sep 2018 21:45:53 +0000 (17:45 -0400)
diff --cc configs/mx6sxsabreauto_defconfig
Simple merge
diff --cc configs/mx6sxsabresd_defconfig
Simple merge
author	Tom Rini <[email protected]>
	Tue, 4 Sep 2018 21:45:53 +0000 (17:45 -0400)
committer	Tom Rini <[email protected]>
	Tue, 4 Sep 2018 21:45:53 +0000 (17:45 -0400)
		1	2
configs/mx6sxsabreauto_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/mx6sxsabresd_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history