[U-Boot] Pull request: u-boot-arm/master

[Tom Rini]

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1

On 03/16/2013 04:19 AM, Albert ARIBAUD wrote:
> Hi Albert,
> 
> On Fri, 15 Mar 2013 23:01:12 +0100, Albert ARIBAUD 
> <albert.u.boot at 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.

I suspect I have all conflicts resolved correctly, but can't run-time
test them.  If someone with a Tegra platform would like to get ahold
of me privately, quickly, I'll send along a binary to try out and
confirm I've got the merge correct.  Otherwise I'll post the diff
monday morning.

- -- 
Tom
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.11 (GNU/Linux)
Comment: Using GnuPG with Thunderbird - http://www.enigmail.net/

iQIcBAEBAgAGBQJRRhxAAAoJENk4IS6UOR1W70gP/0O2fnhKbuNYHw5g0BT8iapR
+xfhKflu5+QDIcruCDX4QkzxgG8onvrBwAkjahSWMjJy+QRRjwM4ik24HYMzLbMN
jWjy/AkJ9hAfrp4Knq/dcKkordM97Bsg0E2mrnSxJTxqQ8vRU5UzZdBga7bl3YRK
U5+YeN5c9ZmGHHtbmhw7zbcPo+7ZwRQEhiMMa4hnCzjZiCu7h3ZNTCuenu/povcr
enQ3LmGtmJdBHsyMccuYh0EJNnYeMnfFmNk5S3roH1ryxqiTOFZIk5n6O7xLxWBD
BxeFC+KmFAt+pbXtl/CUrW0WWyw8YsecO5q/chl0tKXt/EeGGbcuABQ5RrBkXsYU
zD0anY0y9xip8R81IRwbINqvOPxX0tkhJXSQoL6luYNgggZxt4xqrYEUaHaBQJE1
04jy12qRdH5ijUci6/PexY6yigS5yK+G3oiy7GVqSPWW/b3aCgdlygBSsKFONY9p
KHjRNWMz5V/JRCDI0doEzsqJMO94OqGpyZLa6GWIyy6Fk+nheja/OZtDg/fQaSin
10V8GU9YqZ47Ojbr3r2thfDOsmxp4ICjIm2zoKPUuNG9JPImAf3CTtD+DGkijoU/
NIHqHjV3kBSVpxROTfNc8yc+jEjik7FoFCaRTjknKajuZbRTW8anQPiaSmX12WfR
/3UQOpob05rx+OCYYEpq
=L6aj
-----END PGP SIGNATURE-----