Merge git://git.denx.de/u-boot-fsl-qoriq

author Tom Rini <[email protected]>

Thu, 12 Oct 2017 17:36:58 +0000 (13:36 -0400)

committer Tom Rini <[email protected]>

Thu, 12 Oct 2017 17:36:58 +0000 (13:36 -0400)
author Tom Rini <[email protected]>
Thu, 12 Oct 2017 17:36:58 +0000 (13:36 -0400)
committer Tom Rini <[email protected]>
Thu, 12 Oct 2017 17:36:58 +0000 (13:36 -0400)
diff --cc configs/ls1043ardb_nand_SECURE_BOOT_defconfig
Simple merge
diff --cc configs/ls1043ardb_nand_defconfig
Simple merge
diff --cc configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig
Simple merge
diff --cc configs/ls1043ardb_sdcard_defconfig
Simple merge
diff --cc include/configs/ls1021aiot.h
Simple merge
author	Tom Rini <[email protected]>
	Thu, 12 Oct 2017 17:36:58 +0000 (13:36 -0400)
committer	Tom Rini <[email protected]>
	Thu, 12 Oct 2017 17:36:58 +0000 (13:36 -0400)
		1	2
configs/ls1043ardb_nand_SECURE_BOOT_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/ls1043ardb_nand_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/ls1043ardb_sdcard_SECURE_BOOT_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
configs/ls1043ardb_sdcard_defconfig	patch \|	diff1 \|	diff2 \|	blob \| history
include/configs/ls1021aiot.h	patch \|	diff1 \|	diff2 \|	blob \| history