[U-Boot-Users] [U-boot-Users][GIT PULL] Please pull coldfire tree

Wolfgang Denk
2008-06-11T20:44:37Z

In message <48483DCF.4020401@freescale.com> you wrote:
> Wolfgang,
>
> The following changes since commit 8155efbd7ae9c65564ca98affe94631d612ae088:
> Wolfgang Denk (1):
> Merge branch 'master' of ssh://mercury/home/wd/git/u-boot/master
>
> are available in the git repository at:
>
> git+ssh://gu-coldfire at www.denx.de/u-boot.coldfire master

Please switch to using git.denx.de ; the git and www servers may be
separated soon.

> TsiChung Liew (3):
> ColdFire: Add 10 base ethernet support for mcf5445x
> ColdFire: Add M5253DEMO platform support for mcf5253
> ColdFire: Fix warning messages by passing correct data type in
> board.c

Sorry, this is causing a merge conflict in drivers/net/dm9000x.c ;
and I cannot decide which part is correct [and actually this should
go through the net repo].

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
A meeting is an event at which the minutes are kept and the hours are
lost.