[U-Boot-Users] [GIT PULL] Please pull net tree

[Wolfgang Denk]

Dear Ben,

in message <47308E3C.4000103 at qstreams.com> you wrote:
> 
> Please pull the net tree.  I believe it's in sync with the main line.

ACK.

> P.S. is there a way to get rid of the merge log entries from when I sync 
> with the main line, or do we want them there?

I can's answer this one. JDL?

>   git://www.denx.de/git/u-boot-net master
> 
> Ben Warren (2):
>       Merge git://www.denx.de/git/u-boot
>       Merge git://www.denx.de/git/u-boot
> 
> Justin Flammia (1):
>       DHCP Client Fix
> 
> Larry Johnson (2):
>       NET: Cosmetic changes
>       NET: Add Ethernet 1000BASE-X support for PPC4xx
> 
> Roy Zang (1):
>       Implement general ULi 526x Ethernet driver support in U-boot
> 
>  common/cmd_mii.c    |    8 +-
>  common/miiphyutil.c |  282 ++++++++-------
>  drivers/Makefile    |    2 +-
>  drivers/uli526x.c   |  996 
> +++++++++++++++++++++++++++++++++++++++++++++++++++
>  include/miiphy.h    |  114 ++++---
>  net/eth.c           |    4 +
>  6 files changed, 1227 insertions(+), 179 deletions(-)
>  create mode 100644 drivers/uli526x.c

Merged. Thanks!

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 door is what a dog is perpetually on the wrong side of.
                                                        - Ogden Nash