From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Sat, 16 Mar 2013 09:19:58 +0100
Subject: [U-Boot] Pull request: u-boot-arm/master
In-Reply-To: <20130315230112.14998ce0@lilith>
References: <20130315230112.14998ce0@lilith>
Message-ID: <20130316091958.447f06a4@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 Albert,

On Fri, 15 Mar 2013 23:01:12 +0100, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:

> Hello Tom,
> 
> Here is a PR for ARM. Note that doc/README.scrapyard will need a manual
> merge resolution due to ARM tree having a commit that reorders the
> headers and reformats the lines while mainline has a commit adding two
> new entries still in the older format.
> 
> The following changes since commit
> fc959081d41aab2d6f4614c5fb3dd1b77ffcdcf4:
> 
>   x86: Enable CONFIG_OF_CONTROL on coreboot (2013-03-04 15:57:52 -0800)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-arm master
> 
> for you to fetch changes up to b27673ccbd3d5435319b5c09c3e7061f559f925d:
> 
>   Merge branch 'u-boot-tegra/master' into
>   'u-boot-arm/master' (2013-03-15 20:50:43 +0100)

Sorry about the extra merge conflicts -- at the time of my posting, I
only had the scapyard one. Seems like most new conflicts are due to
Simon's BSS name change; that should be resolved by taking my BSS
changes and changing the symbol's name as Simon does elsewhere, but by
the looks of your IRC comment, you'd already figured it out and only the
tegra conflict is left to resolve.

Amicalement,
-- 
Albert.