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: sba...@denx.de
=====================================================================
_______________________________________________
U-Boot mailing list
U-Boot@lists.denx.de
http://lists.denx.de/mailman/listinfo/u-boot

Reply via email to