Tom Rini c83a824e62 Merge git://git.denx.de/u-boot-fsl-qoriq
Signed-off-by: Tom Rini <trini@konsulko.com>

Conflicts:
	configs/ls1046aqds_defconfig
	configs/ls1046aqds_nand_defconfig
	configs/ls1046aqds_qspi_defconfig
	configs/ls1046aqds_sdcard_ifc_defconfig
	configs/ls1046aqds_sdcard_qspi_defconfig
	configs/ls1046ardb_emmc_defconfig
	configs/ls1046ardb_qspi_defconfig
	configs/ls1046ardb_sdcard_defconfig
2017-02-03 20:33:42 -05:00
..
2016-12-16 11:38:24 +01:00
2016-10-24 10:57:16 +02:00
2016-07-15 15:54:57 +02:00
2016-12-15 11:57:35 -08:00
2016-12-15 11:57:44 -08:00
2015-09-28 10:48:24 -04:00