Skip to content
Commit 66669fcf authored by Tom Rini's avatar Tom Rini
Browse files

Merge git://git.denx.de/u-boot-fsl-qoriq 



Signed-off-by: default avatarTom Rini <trini@konsulko.com>

Conflicts:
	arch/arm/cpu/armv8/Makefile
	arch/arm/lib/bootm-fdt.c
parents f60d0603 0e68a369
Show whitespace changes
Inline Side-by-side
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment