]> 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: 6a2f30a 8d18bcf)
Merge remote-tracking branch 'u-boot-sh/rmobile'
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 16 May 2014 18:43:04 +0000 (20:43 +0200)
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>
Fri, 16 May 2014 18:43:04 +0000 (20:43 +0200)
commita26acb7dc946b2fe7fa25736928878f6adf88f46
treeec7b2197b076ecd658a68de12d7a3c03c7bf399ftree | snapshot
parent6a2f30a03acbf226aeb5a93783e6172aa0682d78commit | diff
parent8d18bcfd439b8422ab3bada2001cc2abd525d9f8commit | diff
Merge remote-tracking branch 'u-boot-sh/rmobile'

Conflicts:
boards.cfg

Trivial conflict, maintainer change plus board addition
boards.cfg diff1 | diff2 | blob | history
"Das U-Boot" Source Tree