[U-Boot-Users] Please pull u-boot-mpc83xx.git

Wolfgang Denk wd at denx.de
Thu Dec 27 00:44:26 CET 2007

In message <20071220175658.850eac66.kim.phillips at freescale.com> you wrote:
> Wolfgang D., please pull mainly mpc837x support and libfdt code updates
> for mpc83xx (this pull request depends on the mpc85xx pull request):

Please try and avoid such dependencies on other custodian trees.

> The following changes since commit 41be969f4957115ed7b1fe8b890bfaee99d7a7a2:
>   Wolfgang Denk (1):
>         Release v1.3.1
> are available in the git repository at:
>   git://www.denx.de/git/u-boot-mpc83xx.git

Sorry, this does not apply cleanly even though I pulled the FDT and
85xx repos first:

CONFLICT (content): Merge conflict in cpu/mpc83xx/cpu.c

Please fix and send new pull request.

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
"Am besten betrachten Sie Fehlermeldungen als eine  Art  Psycho-Test,
mit  dem  herausgefunden  werden soll, wie belastbar Sie sind."
 - Dr. R. Wonneberger, Kompaktführer LaTeX, Kap. 1.6: Fehlermeldungen

More information about the U-Boot mailing list