diff options
author | Albert ARIBAUD | 2014-05-16 20:43:04 +0200 |
---|---|---|
committer | Albert ARIBAUD | 2014-05-16 20:43:04 +0200 |
commit | a26acb7dc946b2fe7fa25736928878f6adf88f46 (patch) | |
tree | ec7b2197b076ecd658a68de12d7a3c03c7bf399f /board/dnp5370 | |
parent | 6a2f30a03acbf226aeb5a93783e6172aa0682d78 (diff) | |
parent | 8d18bcfd439b8422ab3bada2001cc2abd525d9f8 (diff) |
Merge remote-tracking branch 'u-boot-sh/rmobile'
Conflicts:
boards.cfg
Trivial conflict, maintainer change plus board addition
Diffstat (limited to 'board/dnp5370')
0 files changed, 0 insertions, 0 deletions