
On 19/06/13 20:30, Albert ARIBAUD wrote:
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.
It's good. confirmed.
Amicalement,
Thanks, Minkyu Kang.