From mboxrd@z Thu Jan  1 00:00:00 1970
From: Piotr Wilczek <p.wilczek@samsung.com>
Date: Tue, 08 Apr 2014 10:54:37 +0200
Subject: [U-Boot] Merge conflicts between ARM and mainline U-Boot trees
In-Reply-To: <E1WXQmU-0003ZN-Pm@janus>
References: <E1WXQmU-0003ZN-Pm@janus>
Message-ID: <5343B94D.1030608@samsung.com>
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 Albert,

>
> 	include/configs/trats2.h:
> 	- commits 4d6c9671 (Piotr) and aafd2c5d (Przemyslaw)
>
> 	include/configs/trats.h:
> 	- commits fe601647 (Piotr) and 9960d9a8 (Lukasz)
> 	- note: I manually removed CONFIG_EFI_PARTITION and
> 	  CONFIG_PARTITION_UUIDS which are already defined in
> 	  include/configs/exynos4-dt.h
>
> Thanks in advance!
>
> Amicalement,
>

Acked-by: Piotr Wilczek <p.wilczek@samsung.com>
Tested-by: Piotr Wilczek <p.wilczek@samsung.com>

Tested on Trats2.

Best regards,
Piotr Wilczek