]> git.ipfire.org Git - people/ms/u-boot.git/commit
projects / people / ms / u-boot.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 6130c14 d7782d0)
Merge remote-tracking branch 'u-boot/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 20 May 2014 08:05:42 +0000 (10:05 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Tue, 20 May 2014 08:05:42 +0000 (10:05 +0200)
commit05d134b084590684bcf4d832c0035952727b7cd9
tree8f5d5fd811634fa621792cad7ca361251c06cd88tree | snapshot
parent6130c14605de760bdcaef36b8a0d34eac2a955f0commit | diff
parentd7782d06534fe4fa47a49fa7c106de5ba85a9687commit | 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).
Makefile diff1 | diff2 | blob | history
boards.cfg diff1 | diff2 | blob | history
"Das U-Boot" Source Tree