Dear Tom, In message <4ad44bde.80...@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: w...@denx.de "One planet is all you get." _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot
