| commit | 95eb65aead3cc8f4be9c1924597920b4a797619e | [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 | 130a753e8635ab4a1a48f58a108087b429582a09 [diff] | |
| parent | a8490d584bb153454622dfa76bcaa3dfb2f9bca2 [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).