From: Albert ARIBAUD Date: Tue, 20 May 2014 08:05:42 +0000 (+0200) Subject: Merge remote-tracking branch 'u-boot/master' X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=05d134b084590684bcf4d832c0035952727b7cd9;p=u-boot.git Merge remote-tracking branch 'u-boot/master' Conflicts: boards.cfg Conflicts were trivial once u-boot-arm/master boards.cfg was reformatted (commit 6130c146) to match u-boot/master's own reformatting (commit 1b37fa83). --- 05d134b084590684bcf4d832c0035952727b7cd9 diff --cc boards.cfg index 07b6920b96,0497a917c6..d31bdba5c7 --- a/boards.cfg +++ b/boards.cfg @@@ -371,9 -367,10 +371,10 @@@ 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 rmobile renesas lager lager_nor lager:NORFLASH Nobuhiro Iwamatsu -Active arm armv7 s5pc1xx samsung goni s5p_goni - Mateusz Zalega +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