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
..
asm	Merge git://git.denx.de/u-boot-fsl-qoriq	2017-02-03 20:33:42 -05:00
debug	arm: debug: replace license blocks with SPDX	2014-10-26 22:22:09 +01:00