16 Oct
2012
16 Oct
'12
12:42 p.m.
Hi all i.MXlers,
my mistake. I have merged yesterday my -next branch without waiting for Tom pulling u-boot/next into u-boot/master. Today I have conflicts, and I could solve them only rebasing the tree on current mainline. I am sorry for the inconvenience.
Regards, Stefano babic
--
=====================================================================
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@denx.de
=====================================================================