Merge branch 'master' of /home/wd/git/u-boot/custodians

diff --cc Makefile
Simple merge

diff --cc drivers/Makefile
index 00978d8,1889698..d19588f
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -45,10 -42,10 +45,10 @@@ COBJS      = 3c589.o 5701rls.o ali512x.o at4
          s3c4510b_eth.o s3c4510b_uart.o \
          sed13806.o sed156x.o \
          serial.o serial_max3100.o \
-         serial_pl010.o serial_pl011.o serial_xuartlite.o \
+         serial_xuartlite.o \
          sil680.o sl811_usb.o sm501.o smc91111.o smiLynxEM.o \
          status_led.o sym53c8xx.o systemace.o ahci.o \
 -        ti_pci1410a.o tigon3.o tsec.o \
 +        ti_pci1410a.o tigon3.o tqm8xx_pcmcia.o tsec.o \
          tsi108_eth.o tsi108_i2c.o tsi108_pci.o \
          usb_ohci.o \
          usbdcore.o usbdcore_ep0.o usbdcore_mpc8xx.o usbdcore_omap1510.o \