* [U-Boot] i.MX : rebasing due to mistake
@ 2012-10-16 10:42 Stefano Babic
0 siblings, 0 replies; only message in thread
From: Stefano Babic @ 2012-10-16 10:42 UTC (permalink / raw)
To: u-boot
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
=====================================================================
^ permalink raw reply [flat|nested] only message in thread
only message in thread, other threads:[~2012-10-16 10:42 UTC | newest]
Thread overview: (only message) (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2012-10-16 10:42 [U-Boot] i.MX : rebasing due to mistake Stefano Babic
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.