On Thursday 30 April 2009, Matthias Fuchs wrote: > > I appreciate your help here! As you'll see, I've put together some > > naive patches to take care of all the boards. I expect I'm missing some > > things that you'll notice. > > Thanks. Seems to be fine. I expect that Stefan will complain about our > patches touching the same boards. Perhaps he will fix it ;-)
Yep. I just got a merge conflict here. And resolved it. Ben, I suggest that I push your 4xx/CONFIG_NET_MULTI patches via my ppc4xx/next repo into mainline because of these problems. Is this ok with you? Best regards, Stefan ===================================================================== DENX Software Engineering GmbH, MD: Wolfgang Denk & Detlev Zundel HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany Phone: +49-8142-66989-0 Fax: +49-8142-66989-80 Email: off...@denx.de ===================================================================== _______________________________________________ U-Boot mailing list U-Boot@lists.denx.de http://lists.denx.de/mailman/listinfo/u-boot