Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next

diff --cc MAINTAINERS
index 58e9aa8,777d141..7efef6a
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -416,17 -416,14 +420,17 @@@ Stephen Williams <steve@icarus.com
  
        JSE             PPC405GPr
  
- John Zhan <zhanz@sinovee.com>
+ Roy Zang <tie-fei.zang@freescale.com>
  
-       svm_sc8xx       MPC8xx
+       mpc7448hpc2     MPC7448
  
- Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+ John Zhan <zhanz@sinovee.com>
  
-       linkstation     MPC8241
+       svm_sc8xx       MPC8xx
  
 +Feng Kan <fkan@amcc.com>
 +
 +      redwood                 PPC4xx
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:

diff --cc Makefile
Simple merge

diff --cc board/amcc/sequoia/sequoia.c
Simple merge