From: Wolfgang Denk Date: Tue, 13 Oct 2009 12:11:15 +0200 Subject: [U-Boot] ARM pull request v2 In-Reply-To: <4AD44BDE.80400@bumblecow.com> References: <4AD3E52D.4050904@windriver.com> <20091013083719.259FDE84EB4@gemini.denx.de> <4AD44BDE.80400@bumblecow.com> Message-ID: <20091013101115.C4BA9E84EB4@gemini.denx.de> List-Id: MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit To: u-boot@lists.denx.de Dear Tom, In message <4AD44BDE.80400@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."