Skip to content
Snippets Groups Projects
Commit 05d134b0 authored by Albert ARIBAUD's avatar Albert ARIBAUD
Browse files

Merge remote-tracking branch 'u-boot/master' 

Conflicts:
	boards.cfg

Conflicts were trivial once u-boot-arm/master boards.cfg was
reformatted (commit 6130c146) to match u-boot/master's own
reformatting (commit 1b37fa83).
parents 6130c146 d7782d06
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 36 additions and 48 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