]> git.sur5r.net Git - u-boot/commit
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
treeec7b2197b076ecd658a68de12d7a3c03c7bf399f
parent6a2f30a03acbf226aeb5a93783e6172aa0682d78
parent8d18bcfd439b8422ab3bada2001cc2abd525d9f8
Merge remote-tracking branch 'u-boot-sh/rmobile'

Conflicts:
boards.cfg

Trivial conflict, maintainer change plus board addition
boards.cfg