| commit | 3eb6e4b2420bad72b03006e17abdfef15f968c93 | [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 | 867ced7d93d98ba5672da82a947a223ee5ac2fa3 [diff] | |
| parent | fe22beae971d512e0d81776de8eaa652be8b34f6 [diff] |
Merge remote-tracking branch 'u-boot-sh/rmobile' Conflicts: boards.cfg Trivial conflict, maintainer change plus board addition