Conflicts: boards.cfg Conflicts were trivial once u-boot-arm/master boards.cfg was reformatted (commit6130c146) to match u-boot/master's own reformatting (commit1b37fa83).
Conflicts: boards.cfg Conflicts were trivial once u-boot-arm/master boards.cfg was reformatted (commit6130c146) to match u-boot/master's own reformatting (commit1b37fa83).