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

diff --cc MAINTAINERS
index a4637fdf1e983f0e45ef26adb8bcc768ea614d92,1f29abb3c71ee17125d56a31c54a431efe2a6dc7..b667c8e594fd6ed764173153586d24a5eb8119c6
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -418,11 -417,8 +417,11 @@@ John Zhan <zhanz@sinovee.com
  
  Guennadi Liakhovetski <g.liakhovetski@gmx.de>
  
-       linkstation             MPC8241
+       linkstation     MPC8241
  
 +Feng Kan <fkan@amcc.com>
 +
 +      redwood                 PPC4xx
  -------------------------------------------------------------------------
  
  Unknown / orphaned boards:

diff --cc MAKEALL
Simple merge

diff --cc board/sandburst/metrobox/metrobox.c
Simple merge