[U-Boot] i.MX : rebasing due to mistake

Stefano Babic sbabic at denx.de
Tue Oct 16 12:42:19 CEST 2012


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 at denx.de
=====================================================================


More information about the U-Boot mailing list