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

Ben Warren
2008-06-11T21:04:13Z

Wolfgang Denk wrote:
> 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
>>
This is already checked in. Commit ff36fbb2e7583fb808eef773f511489c7a9c2df3
>> 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
>
>

regards,
Ben