Skip to content
Snippets Groups Projects
Commit 711b5341 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:
	include/configs/ls1021aqds.h
	include/configs/ls1021atwr.h
parents 84351792 76379dfb
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 365 additions and 97 deletions
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment