From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stephen Warren <swarren@wwwdotorg.org>
Date: Tue, 18 Dec 2012 23:04:09 -0700
Subject: [U-Boot] Conflicting commits for seaboard USB keyboard handling
In-Reply-To: <20121219010807.GB15608@badger>
References: <20121210192504.GA25496@badger>
	<CA+m5__+HN_2cu=8DOJS1Zj+M8zhPZdk+Pcy95janmQNOG9D=2g@mail.gmail.com>
	<CA+m5__LGuYcvHLc3qTm5GLDnG0OuRz8gzXi=L_=2ag_wHeSELw@mail.gmail.com>
	<20121211190209.GB25496@badger> <20121215174108.7d2cd36f@lilith>
	<CA+m5__JtNE6JdndviBGcptnoW3uunYj4HaU3vz8KZN2jWp6KAg@mail.gmail.com>
	<20121217222251.GA11959@badger>
	<CA+m5__+D495bkCjnaJag9zZwb27GDvHCcwoypPv3sjUur52cCA@mail.gmail.com>
	<20121218180614.GA15608@badger>
	<CA+m5__JG4ZdgeZLLa_U39MsXhsYQE3c9F1p+SeHJa42btqqU3Q@mail.gmail.com>
	<20121219010807.GB15608@badger>
Message-ID: <50D158D9.7070209@wwwdotorg.org>
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 12/18/2012 06:08 PM, Allen Martin wrote:
...
> The other alternative is I could provide the conflict resolved files
> or instructions for how to resolve.

Aren't the two sets of files that conflict those that are already in
u-boot/master and u-boot-arm/master? If so, only Albert can resolve the
conflict, by doing a merge. I already did that merge locally a while
back in order to pick up the changes from both branches, and it didn't
seem hard; what's the problem here? If Allen can push out a branch for
Albert to use as an example to make sure he gets the correct merge
result, that seems like a very simple solution.