From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Fri, 16 May 2014 17:53:21 +0200
Subject: [U-Boot] Pull request: u-boot-sh/rmobile into u-boot-arm/master
In-Reply-To: <E1WlJy7-00014L-5Y@janus>
References: <CABMQnVJTu0x5ab3g7B4r5t7bm8NATMB2aVsmYG6QRg_1FE67UQ@mail.gmail.com>
	<CABMQnV+YgBAWsur4Oucbn+cfPHcsvcvx2Hg+m8KzuU0v7zrjYQ@mail.gmail.com>
	<E1WlJy7-00014L-5Y@janus>
Message-ID: <E1WlKRm-0001Ck-Hy@janus>
List-Id: <u-boot.lists.denx.de>
MIME-Version: 1.0
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
To: u-boot@lists.denx.de

Hi Albert,

On Fri, 16 May 2014 17:22:41 +0200, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:

> Hi Nobuhiro,
> 
> On Fri, 16 May 2014 11:14:26 +0900, Nobuhiro Iwamatsu
> <iwamatsu@nigauri.org> wrote:
> 
> > Hi, Albert.
> > 
> > Could you apply this PR?
> 
> Sorry, for some reason it was off my radar. Will apply it along with
> the pending ones.

Hmm, there's a merge conflict in boards.cfg whereby the same board is 
asigned to two different maintainers:

> <<<<<<< HEAD
> 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> 
> =======
> Active arm armv7 s5pc1xx samsung goni s5p_goni - Mateusz Zalega <m.zalega@samsung.com>
>>>>>>> u-boot-sh/rmobile

Which one am I supposed to keep? Or both?

> > Best regards,
> >   Nobuhiro
> 
> Amicalement,

Amicalement,
-- 
Albert.