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

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

Conflicts:
	boards.cfg

Conflict was trivial between goni maintainer change and
lager_nor removal.
parents 019b57cc 5287d595
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 694 additions and 143 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