Merge branch 'next' of /home/wd/git/u-boot/next

Conflicts:
	include/ppc4xx.h

Signed-off-by: Wolfgang Denk <wd@denx.de>

diff --cc Makefile
Simple merge

diff --cc README
Simple merge

diff --cc arch/powerpc/cpu/mpc512x/Makefile
Simple merge

diff --cc arch/powerpc/cpu/ppc4xx/fdt.c
Simple merge

diff --cc board/amcc/ebony/flash.c
index 79d2c4c,94eeee2..df7716c
--- 1/board/amcc/ebony/flash.c
--- 2/board/amcc/ebony/flash.c
+++ b/board/amcc/ebony/flash.c
@@@ -32,9 -32,8 +32,9 @@@
   */
  
  #include <common.h>
- #include <ppc4xx.h>
+ #include <asm/ppc4xx.h>
  #include <asm/processor.h>
 +#include <asm/io.h>
  
  #undef DEBUG
  #ifdef DEBUG

diff --cc drivers/video/cfb_console.c
Simple merge

diff --cc include/common.h
Simple merge

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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

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