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

> Hi Stefano,
> 
> On Fri, 04 Apr 2014 15:52:32 +0200, Stefano Babic <sba...@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.
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to