From mboxrd@z Thu Jan  1 00:00:00 1970
From: Stefano Babic <sbabic@denx.de>
Date: Fri, 04 Apr 2014 15:52:32 +0200
Subject: [U-Boot] [PULL] : Please pull u-boot-imx
In-Reply-To: <533D0E98.2090600@denx.de>
References: <533C40B6.6090701@denx.de>	<E1WVPSK-0006Q9-NP@janus>
	<E1WVbBc-0001cM-ES@janus> <533D0E98.2090600@denx.de>
Message-ID: <533EB920.5090202@denx.de>
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,

On 03/04/2014 09:32, Stefano Babic wrote:

>>> This fails to merge with current u-boot-arm/master. Can you have a look?
>>> Or I have a closer look (much) later tonight.
>>
>> Stefano, I had a look, and I'd rather you solved the merge conflict.

Conflicts are solved - I have already pull u-boot-arm/master. I hope you
have no problem to pull u-boot-imx now.

Thanks,
Stefano

-- 
=====================================================================
DENX Software Engineering GmbH,     MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================