diff options
| author | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-16 20:43:04 +0200 |
|---|---|---|
| committer | Albert ARIBAUD <albert.u.boot@aribaud.net> | 2014-05-16 20:43:04 +0200 |
| commit | a26acb7dc946b2fe7fa25736928878f6adf88f46 (patch) | |
| tree | ec7b2197b076ecd658a68de12d7a3c03c7bf399f /boards.cfg | |
| parent | 6a2f30a03acbf226aeb5a93783e6172aa0682d78 (diff) | |
| parent | 8d18bcfd439b8422ab3bada2001cc2abd525d9f8 (diff) | |
| download | u-boot-a26acb7dc946b2fe7fa25736928878f6adf88f46.tar.gz u-boot-a26acb7dc946b2fe7fa25736928878f6adf88f46.tar.xz u-boot-a26acb7dc946b2fe7fa25736928878f6adf88f46.zip | |
Merge remote-tracking branch 'u-boot-sh/rmobile'
Conflicts:
boards.cfg
Trivial conflict, maintainer change plus board addition
Diffstat (limited to 'boards.cfg')
| -rw-r--r-- | boards.cfg | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/boards.cfg b/boards.cfg index dcc2014799..7e84b9b7f1 100644 --- a/boards.cfg +++ b/boards.cfg @@ -371,7 +371,6 @@ Active arm armv7 omap5 ti omap5_uevm Active arm armv7 rmobile atmark-techno armadillo-800eva armadillo-800eva - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Active arm armv7 rmobile kmc kzm9g kzm9g - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>:Tetsuyuki Kobayashi <koba@kmckk.co.jp> Active arm armv7 rmobile renesas koelsch koelsch - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> -Active arm armv7 rmobile renesas koelsch koelsch_nor koelsch:NORFLASH Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Active arm armv7 rmobile renesas lager lager - Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Active arm armv7 rmobile renesas lager lager_nor lager:NORFLASH Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com> Active arm armv7 s5pc1xx samsung goni s5p_goni - Przemyslaw Marczak <p.marczak@samsung.com> |