]> git.ipfire.org Git - people/ms/u-boot.git/commitdiff
projects / people / ms / u-boot.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: c0e5dd8 c93addb)
Merge branch 'u-boot-imx/master' into 'u-boot-arm/master'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 7 Nov 2013 08:32:16 +0000 (09:32 +0100)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Thu, 7 Nov 2013 08:32:16 +0000 (09:32 +0100)
1  2 
boards.cfg patch | diff1 | diff2 | blob | history

diff --cc boards.cfg
Simple merge
"Das U-Boot" Source Tree