From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Wed, 19 Jun 2013 13:30:33 +0200
Subject: [U-Boot] please pull u-boot-samsung master
In-Reply-To: <51BE7032.9010802@samsung.com>
References: <51BE7032.9010802@samsung.com>
Message-ID: <20130619133033.6296f900@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 Minkyu,

On Mon, 17 Jun 2013 11:10:58 +0900, Minkyu Kang <mk7.kang@samsung.com>
wrote:

> Dear Albert,
> 
> The following changes since commit d0a51373131c4ba565a2391d5ed78b87c406ce98:
> 
>   at91sam9260ek: move board id setup to config header (2013-05-12 16:49:14 +0200)
> 
> are available in the git repository at:
> 
>   git://git.denx.de/u-boot-samsung master
> 
> for you to fetch changes up to ed7bdc03eb516fb698ccc12ec5b4b9f132d05c5f:
> 
>   MMC: DWMMC: Fix FIFO_DEPTH calculation (2013-06-17 11:03:42 +0900)

I had three merge conflicts here, two solved automatically (files
drivers/mmc/mmc.c and include/mmc.h) and one manually (spl/Makefile).

I have pushed the resulting branch as mastercandidate.

Please confirm that the resolutions are ok.

Amicalement,
-- 
Albert.