Tom Rini 711b534120 Merge git://git.denx.de/u-boot-fsl-qoriq ... Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: include/configs/ls1021aqds.h include/configs/ls1021atwr.h		2016-10-12 08:29:42 -04:00
..
asm	Merge git://git.denx.de/u-boot-fsl-qoriq	2016-10-12 08:29:42 -04:00
debug	arm: debug: replace license blocks with SPDX	2014-10-26 22:22:09 +01:00