Merge with /home/wd/git/u-boot/custodian/u-boot-74xx-7xx

diff --cc MAKEALL
Simple merge

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc cpu/ppc4xx/44x_spd_ddr2.c
Simple merge

diff --cc cpu/ppc4xx/start.S
Simple merge

diff --cc drivers/Makefile
index 2eac7c8,60ce3b4..df9fbf2
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -32,11 -32,11 +32,11 @@@ COBJS      = 3c589.o 5701rls.o ali512x.o atm
          cs8900.o ct69000.o dataflash.o dc2114x.o dm9000x.o \
          e1000.o eepro100.o \
          i8042.o inca-ip_sw.o keyboard.o \
 -        lan91c96.o \
 +        lan91c96.o macb.o \
          natsemi.o ne2000.o netarm_eth.o netconsole.o \
          ns16550.o ns8382x.o ns87308.o ns7520_eth.o omap1510_i2c.o \
-         omap24xx_i2c.o pci.o pci_auto.o pci_indirect.o \
-         pcnet.o plb2800_eth.o \
+         omap24xx_i2c.o pci.o pci_auto.o pci_indirect.o tsi108_pci.o\
+         tsi108_i2c.o pcnet.o plb2800_eth.o \
          ps2ser.o ps2mult.o pc_keyb.o \
          rtl8019.o rtl8139.o rtl8169.o \
          s3c4510b_eth.o s3c4510b_uart.o \

diff --cc include/asm-ppc/global_data.h
Simple merge

diff --cc net/eth.c
Simple merge