commit | a26acb7dc946b2fe7fa25736928878f6adf88f46 | [log] [tgz] |
---|---|---|
author | Albert ARIBAUD <albert.u.boot@aribaud.net> | Fri May 16 20:43:04 2014 +0200 |
committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | Fri May 16 20:43:04 2014 +0200 |
tree | ec7b2197b076ecd658a68de12d7a3c03c7bf399f | |
parent | 6a2f30a03acbf226aeb5a93783e6172aa0682d78 [diff] | |
parent | 8d18bcfd439b8422ab3bada2001cc2abd525d9f8 [diff] |
Merge remote-tracking branch 'u-boot-sh/rmobile' Conflicts: boards.cfg Trivial conflict, maintainer change plus board addition