Merge with git://www.denx.de/git/u-boot.git

diff --combined MAINTAINERS
index 0439454,2a43848..c3c73da
mode 100755,100644..100644
--- 1/MAINTAINERS
--- 2/MAINTAINERS
+++ b/MAINTAINERS
@@@ -257,6 -257,15 +257,6 @@@ Frank Panno <fpanno@delphintech.com
  
        ep8260                  MPC8260
  
 -Peter Pearse <peter.pearse@arm.com>
 -      integratorcp            All current ARM supplied &
 -                              supported core modules
 -                              - see http://www.arm.com
 -                              /products/DevTools
 -                              /Hardware_Platforms.html
 -      versatile               ARM926EJ-S
 -      versatile               ARM926EJ-S
 -
  Denis Peter <d.peter@mpl.ch>
  
        MIP405                  PPC4xx
@@@ -275,6 -284,7 +275,7 @@@ Stefan Roese <sr@denx.de
  
        TQM85xx                 MPC8540/8541/8555/8560
  
+       acadia                  PPC405EZ
        alpr                    PPC440GX
        bamboo                  PPC440EP
        bunbinga                PPC405EP
@@@ -341,6 -351,7 +342,7 @@@ John Zhan <zhanz@sinovee.com
  Timur Tabi <timur@freescale.com>
  
        MPC8349E-mITX           MPC8349
+       MPC8349E-mITX-GP        MPC8349
  
  Kim Phillips <kim.phillips@freescale.com>
  
@@@ -433,9 -444,6 +435,9 @@@ Gary Jennejohn <gj@denx.de
        smdk2400                ARM920T
        trab                    ARM920T
  
 +Konstantin Kletschke <kletschke@synertronixx.de>
 +      scb9328                 ARM920T
 +
  Nishant Kamat <nskamat@ti.com>
  
        omap1610h2              ARM926EJS
@@@ -453,15 -461,6 +455,15 @@@ Rolf Offermanns <rof@sysgo.de
  
        shannon                 SA1100
  
 +Peter Pearse <peter.pearse@arm.com>
 +      integratorcp            All current ARM supplied &
 +                              supported core modules
 +                              -see http://www.arm.com
 +                              /products/DevTools
 +                              /Hardware_Platforms.html
 +      versatile               ARM926EJ-S
 +      versatile               ARM926EJ-S
 +
  Dave Peverley <dpeverley@mpc-data.co.uk>
  
        omap730p2               ARM926EJS
@@@ -565,6 -564,11 +567,11 @@@ Yasushi Shoji <yashi@atmark-techno.com
  
        SUZAKU                  MicroBlaze
  
+ Michal Simek <monstr@monstr.eu>
+ 
+       ML401                   MicroBlaze
+       XUPV2P                  MicroBlaze
+ 
  #########################################################################
  # Coldfire Systems:                                                   #
  #                                                                     #