Merge git://git.denx.de/u-boot-fsl-qoriq
authorTom Rini <trini@konsulko.com>
Tue, 19 Jul 2016 20:38:57 +0000 (16:38 -0400)
committerTom Rini <trini@konsulko.com>
Tue, 19 Jul 2016 20:38:57 +0000 (16:38 -0400)
commit66669fcf809c1e3ff644b12e04e625d3737ffd8e
tree362111f12b9dcf33eb31e165d882957df45fc896
parentf60d0603edca472c4458b30956f38c6c1a836d66
parent0e68a3694d1f33c69be7d1cec5a4261aa1d3d01d
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
README
arch/arm/cpu/armv8/Makefile
arch/arm/include/asm/psci.h
arch/arm/lib/bootm-fdt.c
arch/arm/mach-sunxi/board.c
common/board_f.c