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
..
2017-02-03 20:33:42 -05:00
2016-01-27 15:43:01 +01:00
2017-01-25 17:38:45 -05:00
2017-02-01 08:14:39 -08:00
2016-01-25 10:39:44 -05:00
2017-01-04 19:40:41 -05:00
2014-12-08 09:35:45 -05:00