From: Albert ARIBAUD Date: Fri, 16 May 2014 18:43:04 +0000 (+0200) Subject: Merge remote-tracking branch 'u-boot-sh/rmobile' X-Git-Tag: v2014.07-rc2~9^2~2 X-Git-Url: https://git.kernelconcepts.de/?p=karo-tx-uboot.git;a=commitdiff_plain;h=a26acb7dc946b2fe7fa25736928878f6adf88f46 Merge remote-tracking branch 'u-boot-sh/rmobile' Conflicts: boards.cfg Trivial conflict, maintainer change plus board addition --- a26acb7dc946b2fe7fa25736928878f6adf88f46 diff --cc boards.cfg index dcc2014799,ca7719770e..7e84b9b7f1 --- a/boards.cfg +++ b/boards.cfg @@@ -371,10 -367,8 +371,9 @@@ Active arm armv7 omap Active arm armv7 rmobile atmark-techno armadillo-800eva armadillo-800eva - Nobuhiro Iwamatsu Active arm armv7 rmobile kmc kzm9g kzm9g - Nobuhiro Iwamatsu :Tetsuyuki Kobayashi Active arm armv7 rmobile renesas koelsch koelsch - Nobuhiro Iwamatsu - Active arm armv7 rmobile renesas koelsch koelsch_nor koelsch:NORFLASH Nobuhiro Iwamatsu Active arm armv7 rmobile renesas lager lager - Nobuhiro Iwamatsu -Active arm armv7 s5pc1xx samsung goni s5p_goni - Mateusz Zalega +Active arm armv7 rmobile renesas lager lager_nor lager:NORFLASH Nobuhiro Iwamatsu +Active arm armv7 s5pc1xx samsung goni s5p_goni - Przemyslaw Marczak Active arm armv7 s5pc1xx samsung smdkc100 smdkc100 - Minkyu Kang Active arm armv7 socfpga altera socfpga socfpga_cyclone5 - - Active arm armv7 u8500 st-ericsson snowball snowball - Mathieu Poirier