From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Thu, 28 Mar 2013 14:38:23 +0100
Subject: [U-Boot] Merge conflict on Tegra SPI between u-boot/master and
 u-boot-arm/master
Message-ID: <20130328143823.7cb30d58@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

Hello all,

While preparing for an ARM PR, specifically a merge between commit
417c55803118eb8e350d5ab8ba6583fb39f4e2e3 (current u-boot/master ToT)
and commit d53e340edf65ff253d3a7b06ebe60501045892e3 (current Tot for
u-boot-arm/master), I hit the following merge conflicts:

CONFLICT (content): Merge conflict in lib/fdtdec.c
CONFLICT (content): Merge conflict in include/fdtdec.h
CONFLICT (content): Merge conflict in drivers/spi/tegra20_sflash.c

While the first two, related to FDT, are simple (colliding additions to
the same enum from both branches) and can be manually resolved, the
third one, drivers/spi/tegra20_sflash.c, is not, and can not, at least,
not by me, as I am not a specialist on Tegra SPI.

Tom (Warren), can you advise on how to best solve this?

Amicalement,
-- 
Albert.