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

Merge branch 'u-boot/master' into 'u-boot-arm/master' 

Trivial merge conflict, needed to manually remove
local_info as per commit 41364f0f.

Conflicts:
	board/samsung/common/board.c
parents 63f347ec 2c072c95
No related branches found
No related tags found
No related merge requests found
Hide whitespace changes
Inline Side-by-side
Showing
with 556 additions and 70 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