mirror of
https://github.com/smaeul/u-boot.git
synced 2025-09-16 15:06:01 +01:00
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).