On 11/05/2013 13:26, Albert ARIBAUD wrote: >> >> Of course ! We should only merge > > Ok, so I prefer getting things right before I proceed: after I merged > your PR, you did not rebase your master,
Right ! Never ! > you (fast-forward) merged my > master to it. Correct ! > What you have rebased is your next branch, right? Right ! Best regards, 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