8 Dec
2012
8 Dec
'12
8:34 p.m.
Hi Stefano,
On Sat, Dec 8, 2012 at 9:27 AM, Stefano Babic sbabic@denx.de wrote:
Hi Fabio, hi Albert,
I have already found this conflict and fixed it (I hope). Fabio, to have a look, I pushed a temporary "master_merge" branch on u-boot-imx. If everything is fine, I will push the changes in the master branch as usual.
I will be able to access to my mx25pdk next Tuesday and will test your 'master_merge' branch.
Thanks,
Fabio Estevam