[U-Boot] ARM pull request v2
Wolfgang Denk
wd at denx.de
Tue Oct 13 12:11:15 CEST 2009
Dear Tom,
In message <4AD44BDE.80400 at bumblecow.com> you wrote:
>
> > I tried pulling your repo in a temp branch and rebase this, but this
> > caused a lots of merge conflicts in non-ARM files.
> >
> > Can you please try to clean this up? Maybe we can split this in a list
> > of ARM related commits that can be cherry-picked?
>
> Yes I see that that merge conflict.
> I will clean this up to a new branch by cherry-picking.
> This may take a day or two to do and to verify.
> I will have it done asap.
Thanks a lot.
Best regards,
Wolfgang Denk
--
DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-10 Fax: (+49)-8142-66989-80 Email: wd at denx.de
"One planet is all you get."
More information about the U-Boot
mailing list