Merge with /home/wd/git/u-boot/custodian/u-boot-testing

diff --cc MAKEALL
Simple merge

diff --cc common/main.c
Simple merge

diff --cc drivers/Makefile
index c7fcc3f23e550650de2402ea9528aec30694a596,8ad530fb2ae32411326df5c862a03197cef03c49..48fd4eaade0c1c1b1ae193127f418cd42eefe62a
--- 1/drivers/Makefile
--- 2/drivers/Makefile
+++ b/drivers/Makefile
@@@ -27,10 -27,10 +27,10 @@@ include $(TOPDIR)/config.m
  
  LIB   = $(obj)libdrivers.a
  
- COBJS = 3c589.o 5701rls.o ali512x.o atmel_usart.o \
+ COBJS = 3c589.o 5701rls.o ali512x.o ata_piix.o atmel_usart.o \
          bcm570x.o bcm570x_autoneg.o cfb_console.o cfi_flash.o \
          cs8900.o ct69000.o dataflash.o dc2114x.o dm9000x.o \
 -        e1000.o eepro100.o \
 +        e1000.o eepro100.o enc28j60.o \
          i8042.o inca-ip_sw.o keyboard.o \
          lan91c96.o macb.o \
          natsemi.o ne2000.o netarm_eth.o netconsole.o \

diff --cc include/configs/MPC8641HPCN.h
Simple merge

diff --cc include/configs/stxssa.h
Simple merge