| commit | 05d134b084590684bcf4d832c0035952727b7cd9 | [log] [tgz] |
|---|---|---|
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue May 20 10:05:42 2014 +0200 |
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Tue May 20 10:05:42 2014 +0200 |
| tree | 8f5d5fd811634fa621792cad7ca361251c06cd88 | |
| parent | 6130c14605de760bdcaef36b8a0d34eac2a955f0 [diff] | |
| parent | d7782d06534fe4fa47a49fa7c106de5ba85a9687 [diff] |
Merge remote-tracking branch 'u-boot/master' 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).