diff options
| author | Albert ARIBAUD | 2014-05-15 16:36:02 +0200 |
|---|---|---|
| committer | Albert ARIBAUD | 2014-05-15 16:36:02 +0200 |
| commit | 9f5f51540d0d6af03ff22f55b7afc3fda6a4120d (patch) | |
| tree | 51ad9a5b740255d53d3381f79fb6011e4928ad40 /boards.cfg | |
| parent | 41623c91b09a0c865fab41acdaff30f060f29ad6 (diff) | |
| parent | 9b97b727dcfbdc02a0a78e4c1d81670742f28784 (diff) | |
Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
Diffstat (limited to 'boards.cfg')
| -rw-r--r-- | boards.cfg | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/boards.cfg b/boards.cfg index 2eadd0d9720..880d972523b 100644 --- a/boards.cfg +++ b/boards.cfg @@ -370,7 +370,7 @@ Active arm armv7 rmobile renesas koelsch 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 - Mateusz Zalega <m.zalega@samsung.com> +Active arm armv7 s5pc1xx samsung goni s5p_goni - Przemyslaw Marczak <p.marczak@samsung.com> Active arm armv7 s5pc1xx samsung smdkc100 smdkc100 - Minkyu Kang <mk7.kang@samsung.com> Active arm armv7 socfpga altera socfpga socfpga_cyclone5 - - Active arm armv7 u8500 st-ericsson snowball snowball - Mathieu Poirier <mathieu.poirier@linaro.org> |