mirror of
https://github.com/smaeul/u-boot.git
synced 2025-11-01 04:28:36 +00:00
Trivial merge conflict, needed to manually remove local_info as per commit 41364f0f. Conflicts: board/samsung/common/board.c
Trivial merge conflict, needed to manually remove local_info as per commit 41364f0f. Conflicts: board/samsung/common/board.c