[U-Boot] Please pull u-boot-mpc83xx.git
Wolfgang Denk
wd at denx.de
Tue Mar 10 00:45:41 CET 2009
Dear Kim Phillips,
In message <20090309183845.f55f0801.kim.phillips at freescale.com> you wrote:
> On Mon, 09 Mar 2009 00:39:16 +0100
> Wolfgang Denk <wd at denx.de> wrote:
>
> > > Heiko Schocher (7):
> > > i2c, dtt: move dtt_init () to board_init_r ()
> >
> > You were not supposed to add this to your tree!!!
>
> argh, the fact that Heiko had already applied this to his tree slipped
> me. Apologies to both you and Heiko.
No problem. Were you able to check if I resolved the merge conflicts
correctly?
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
"May the forces of evil become confused on the way to your house."
- George Carlin
More information about the U-Boot
mailing list