Skip to content
Commit 40253dd1 authored by Tom Rini's avatar Tom Rini
Browse files

Merge git://git.denx.de/u-boot-socfpga 



Conflicts:
	include/configs/axs101.h

Signed-off-by: default avatarTom Rini <trini@konsulko.com>
parents 8182b419 e6625738
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