[U-Boot] [PULL] : Please pull u-boot-imx

[Stefano Babic]

On 05/04/2014 13:03, Albert ARIBAUD wrote:
> On Sat, 5 Apr 2014 10:22:03 +0200, Albert ARIBAUD
> <albert.u.boot at aribaud.net> wrote:
> 
>> Hi Stefano,
>>
>> On Fri, 04 Apr 2014 15:52:32 +0200, Stefano Babic <sbabic at 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?
> 

Done !

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
=====================================================================