From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Mon, 11 Mar 2013 10:38:21 +0100
Subject: [U-Boot] Conflict between mainline and ARM trees on davinci
Message-ID: <20130311103821.206f8faf@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,

There is merge conflict between mainline and ARM trees on davinci gpio,
between

	commit 03414ac45e119496e2475aeacbb968bb67da24f8
	gpio: Build the da8xx_gpio code for the davinci644x device
	(mainline)

and

	commit b9f56698c7e9bf7ac773b5346c4f6886e214b69b
	da8xx: Add the missing pinmux for da830 to the gpio driver
	(ARM, from TI tree)

Authors CC:ed, as well as Tom for both TI and mainline tree.

Tom, how do you want to reconcile things?

Manual resolution in the merge commit was frowned upon last time I did
it, because it introduces non-reviewed code changes.

This leaves doing a manual commit on either one of the mainline, ARM or
TI trees so that merge becomes trivial. Mainline tree is preferable I
think, because it avoids added PR.

Amicalement,
-- 
Albert.