From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Thu, 30 May 2013 18:21:21 +0200
Subject: [U-Boot] Conflict resolution for u-boot-arm/master and
 u-boot/master merge
In-Reply-To: <20130530145541.7d6958de@lilith>
References: <20130530145541.7d6958de@lilith>
Message-ID: <20130530182121.5fa449ba@lilith>
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

On Thu, 30 May 2013 14:55:41 +0200, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:

> Hello Tom and Bo,
> 
> While preparing for my ARM PR, I have encountered two merge conflicts.
> Their resolution can be found in branch 'merge_from_mainline' of ARM
> repo git://git.denx.de/u-boot-arm.
> 
> For common/cmd_fpga.c, the merge conflict was trivial -- Simon's
> renaming fit somehow caused a need for manual resolution just to
> select the version with the right name. Simon, can you confirm that my
> resolution is correct?

... actually adding Simon as To:...

Amicalement,
-- 
Albert.