From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Thu, 28 Mar 2013 18:47:18 +0100
Subject: [U-Boot] Merge conflict on Tegra SPI between u-boot/master and
 u-boot-arm/master
In-Reply-To: <CA+m5__Lt_tKrWnYMQEDgaFVcL1WdJDAXBDC9iFaDDcX6-9whvQ@mail.gmail.com>
References: <20130328143823.7cb30d58@lilith>
	<CA+m5__JN+V-o1shbFTrtnzRqk4U5Qb6qDdbrGV78js9JTqbHOg@mail.gmail.com>
	<CA+m5__Lt_tKrWnYMQEDgaFVcL1WdJDAXBDC9iFaDDcX6-9whvQ@mail.gmail.com>
Message-ID: <20130328184718.393fa484@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 Tom,

> Just confirmed - in tegra20_sflash.c, remove the <<<<< HEAD section (#ifdef
> CONFIG_OF_CONTROL + 2 lines), and keep the "tegra: spi remove non fdt
> support" section (spi->slave.bus = bus + 4 lines).

Ok, thanks a lot for confirming. I'll do the merge (and tests)
accordingly on u-boot-arm and then send out my PR to The Other
Tom.

Amicalement,
-- 
Albert.