From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Wed, 19 Dec 2012 23:42:24 +0100
Subject: [U-Boot] Conflicting commits for seaboard USB keyboard handling
In-Reply-To: <20121219211137.GC15608@badger>
References: <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> <50D158D9.7070209@wwwdotorg.org>
	<20121219203726.0163f85e@lilith> <20121219211137.GC15608@badger>
Message-ID: <20121219234224.75bed961@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

Hi Allen,

> Hi Albert, I did a merge of u-boot/master into u-boot-arm/master and
> resolved the conflicts and I've pushed the result to:
> 
>  git://github.com/arm000/u-boot.git
>  branch: u-boot-arm-merge-resolved
> 
> I resolved all the conflicts, but the only ones I claim I did
> correctly were the changes to:
> 
>  include/configs/seaboard.h
>  include/configs/tegra-common-post.h
> 
> the other conflicts were not related to tegra.
> 
> If you want a new pull request, you'll first have to unroll the
> previously merged tegra patches from u-boot-arm/master so I can give
> you a conflict free merge request.

Thanks Allen, this branch is what I wanted exactly -- I don't want to
ask for a rollback. As soon as I am sure about the samsung branch, I'll
merge all "fix" branches into ARM.

> -Allen
> -- 
> nvpublic

Amicalement,
-- 
Albert.