From mboxrd@z Thu Jan  1 00:00:00 1970
From: Albert ARIBAUD <albert.u.boot@aribaud.net>
Date: Sat, 5 Apr 2014 13:03:29 +0200
Subject: [U-Boot] [PULL] : Please pull u-boot-imx
In-Reply-To: <E1WWLrY-0007RH-LO@janus>
References: <533C40B6.6090701@denx.de> <E1WVPSK-0006Q9-NP@janus>
	<E1WVbBc-0001cM-ES@janus> <533D0E98.2090600@denx.de>
	<533EB920.5090202@denx.de> <E1WWLrY-0007RH-LO@janus>
Message-ID: <E1WWONm-0008Bp-Hx@janus>
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

On Sat, 5 Apr 2014 10:22:03 +0200, Albert ARIBAUD
<albert.u.boot@aribaud.net> wrote:

> Hi Stefano,
> 
> On Fri, 04 Apr 2014 15:52:32 +0200, Stefano Babic <sbabic@denx.de>
> wrote:
> 
> > 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. Can you just send out a new PR?

(meanwhile, I'm preparing the tests and ARM PR)

Amicalement,
-- 
Albert.