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

author Tom Rini <trini@konsulko.com>

Tue, 31 Oct 2017 12:14:53 +0000 (08:14 -0400)

committer Tom Rini <trini@konsulko.com>

Tue, 31 Oct 2017 12:14:53 +0000 (08:14 -0400)
author Tom Rini <trini@konsulko.com>
Tue, 31 Oct 2017 12:14:53 +0000 (08:14 -0400)
committer Tom Rini <trini@konsulko.com>
Tue, 31 Oct 2017 12:14:53 +0000 (08:14 -0400)
diff --cc configs/imx6qdl_icore_nand_defconfig
Simple merge
diff --cc configs/mx7dsabresd_defconfig
Simple merge
diff --cc configs/mx7dsabresd_secure_defconfig
Simple merge
diff --cc configs/opos6uldev_defconfig
Simple merge
author	Tom Rini <trini@konsulko.com>
	Tue, 31 Oct 2017 12:14:53 +0000 (08:14 -0400)
committer	Tom Rini <trini@konsulko.com>
	Tue, 31 Oct 2017 12:14:53 +0000 (08:14 -0400)
		1	2
configs/imx6qdl_icore_nand_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/mx7dsabresd_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/mx7dsabresd_secure_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/opos6uldev_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history