From: Albert ARIBAUD <albert.u.boot@aribaud.net> Date: Tue, 1 Jul 2014 18:52:51 +0000 (+0200) Subject: Merge remote-tracking branch 'u-boot-samsung/master' X-Git-Tag: v2025.01-rc5-pxa1908~15123^2 X-Git-Url: http://git.dujemihanovic.xyz/html/static/git-favicon.png?a=commitdiff_plain;h=304f936aeaab0c3cc9d5af438fd3498ac7682991;p=u-boot.git Merge remote-tracking branch 'u-boot-samsung/master' Conflicts: boards.cfg Conflict was trivial between goni maintainer change and lager_nor removal. --- 304f936aeaab0c3cc9d5af438fd3498ac7682991 diff --cc boards.cfg index 24e3a9c158,673e599520..8e2db8277e --- a/boards.cfg +++ b/boards.cfg @@@ -367,8 -376,10 +368,8 @@@ Active arm armv7 omap 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 s5pc1xx samsung goni s5p_goni - Przemyslaw Marczak <p.marczak@samsung.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 - Robert Baldyga <r.baldyga@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 sunxi - sunxi Cubietruck sun7i:CUBIETRUCK,SPL,SUNXI_GMAC,RGMII -