Skip to content
Snippets Groups Projects
Commit ec7483e3 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/ls1046aqds.h
	include/configs/ls1046ardb.h
parents 07d77838 ec85721c
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 41 additions and 16 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