From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Sun, 9 Dec 2012 07:03:39 +0100
Subject: [U-Boot] Conflicting commits for seaboard USB keyboard handling
Message-ID: <20121209070339.037b6421@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,

It seems like two commits 5ddcc38b (in u-boot, committed by Marek)
29f3e3f2 (in u-boot-arm, committed by Tom from u-boot-tegra) are
conflicting on the seaboard configuration header file for USB (and
possibly other areas).

Tom, can you look into it (and involve whoever is needed) and provide a
pull request with a fix, the same way I asked Stefano and Minkyu for
the same?

Thanks in advance!

Amicalement,
-- 
Albert.