Pull Request: u-boot-net

Wolfgang,

Please pull from u-boot-net. I merged with mainline tonight, so hopefully everything's up-to-date. I'm sure you'll let me know if anything's amiss.

regards,
Ben

------------------------------------

The following changes since commit 8a92b7c60b40ff79e2cc96e13aeac2a531dde473:
Wolfgang Denk (1):
Merge with /home/wd/git/u-boot/custodian/u-boot-mpc86xx

are found in the git repository at:

git://www.denx.de/git/u-boot-net.git

Ben Warren (1):
Sync'd u-boot-net with mainline

David Updegraff (1):
multicast tftp: RFC2090

Mike Rapoport (1):
Add ability to take MAC address from the environment to DM9000 driver

Vadim Bendebury (1):

      cosmetic changes to bcm570x driver

Wilson Callan (1):
New CONFIG_BOOTP_SERVERIP option

 README               |   15 +-
 drivers/bcm570x.c    | 2322 ++++++-------
 drivers/bcm570x_lm.h |  207 +-
 drivers/bcm570x_mm.h |   58 +-
 drivers/dm9000x.c    |   15 +
 drivers/rtl8139.c    |    7 +
 drivers/tigon3.c     | 9697 
++++++++++++++++++++++++--------------------------
 drivers/tigon3.h     | 3759 ++++++++++----------
 drivers/tsec.c       |   48 +
 include/net.h        |   34 +-
 net/bootp.c          |    2 +
 net/eth.c            |   45 +
 net/net.c            |    8 +
 net/tftp.c           |  238 ++-
 14 files changed, 8076 insertions(+), 8379 deletions(-)

Dear Ben,

Done.

There were a few files with trailing white space (drivers/rtl8139.c, net/eth.c, net/net.c, net/tftp.c). I fixed these.

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
Anyone who doesn't believe in miracles is not a realist.
                                                   - David Ben Gurion

Thanks. I used the --whitespace=strip option in git-am, so am a bit curious how this happened.

regards,
Ben