Merge with git+ssh://atlas/home/wd/git/u-boot/master

[u-boot] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
old mode 100755 (executable)
new mode 100644 (file)
index 0439454..693b115
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -221,10 +221,11 @@ Jon Loeliger <jdl@freescale.com>
 
        MPC8641HPCN             MPC8641D
 
-Dan Malek <dan@embeddededge.com>
+Dan Malek <dan@embeddedalley.com>
 
-       STxGP3                  MPC85xx
-       STxXTc                  MPC8xx
+       stxgp3                  MPC85xx
+       stxssa                  MPC85xx
+       stxxtc                  MPC8xx
 
 Eran Man <eran@nbase.co.il>
 
@@ -275,11 +276,13 @@ Stefan Roese <sr@denx.de>
 
        TQM85xx                 MPC8540/8541/8555/8560
 
+       acadia                  PPC405EZ
        alpr                    PPC440GX
        bamboo                  PPC440EP
        bunbinga                PPC405EP
        ebony                   PPC440GP
        katmai                  PPC440SPe
+       lwmon5                  PPC440EPx
        ocotea                  PPC440GX
        p3p440                  PPC440GP
        pcs440ep                PPC440EP
@@ -341,6 +344,7 @@ John Zhan <zhanz@sinovee.com>
 Timur Tabi <timur@freescale.com>
 
        MPC8349E-mITX           MPC8349
+       MPC8349E-mITX-GP        MPC8349
 
 Kim Phillips <kim.phillips@freescale.com>
 
@@ -565,6 +569,11 @@ Yasushi Shoji <yashi@atmark-techno.com>
 
        SUZAKU                  MicroBlaze
 
+Michal Simek <monstr@monstr.eu>
+
+       ML401                   MicroBlaze
+       XUPV2P                  MicroBlaze
+
 #########################################################################
 # Coldfire Systems:                                                    #
 #                                                                      #