Tom Rini 66669fcf80 Merge git://git.denx.de/u-boot-fsl-qoriq ... Signed-off-by: Tom Rini <trini@konsulko.com> Conflicts: arch/arm/cpu/armv8/Makefile arch/arm/lib/bootm-fdt.c		2016-07-19 16:38:57 -04:00
..
asm	Merge git://git.denx.de/u-boot-fsl-qoriq	2016-07-19 16:38:57 -04:00
debug	arm: debug: replace license blocks with SPDX	2014-10-26 22:22:09 +01:00