Merge branch 'master' of git://git.denx.de/u-boot-nand-flash

[platform/kernel/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a5d1038..dfe54a7 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -319,8 +319,8 @@ Ricardo Ribalda <ricardo.ribalda@uam.es>
 
        ml507           PPC440x5
        v5fx30teval     PPC440x5
-       xilinx-pp440-generic    PPC440x5
-       xilinx-pp405-generic    PPC405
+       xilinx-ppc405-generic   PPC405
+       xilinx-ppc440-generic   PPC440x5
 
 Stefan Roese <sr@denx.de>
 
@@ -366,6 +366,10 @@ Travis Sawyer (travis.sawyer@sandburst.com>
        METROBOX        PPC440GX
        XPEDITE1K       PPC440GX
 
+Georg Schardt <schardt@team-ctech.de>
+
+       fx12mm          PPC405
+
 Heiko Schocher <hs@denx.de>
 
        ids8247         MPC8247
@@ -407,6 +411,10 @@ Rune Torgersen <runet@innovsys.com>
 
        MPC8266ADS      MPC8266
 
+Peter Tyser <ptyser@xes-inc.com>
+
+       XPEDITE5200     MPC8548
+       XPEDITE5370     MPC8572
 
 David Updegraff <dave@cray.com>
 
@@ -612,6 +620,10 @@ Alex Z
        lart            SA1100
        dnp1110         SA1110
 
+Sergey Lapin <slapin@ossfans.org>
+
+       afeb9260        ARM926EJS (AT91SAM9260 SoC)
+
 -------------------------------------------------------------------------
 
 Unknown / orphaned boards:
@@ -695,8 +707,7 @@ Yasushi Shoji <yashi@atmark-techno.com>
 
 Michal Simek <monstr@monstr.eu>
 
-       ML401           MicroBlaze
-       XUPV2P          MicroBlaze
+       microblaze-generic      MicroBlaze
 
 #########################################################################
 # Coldfire Systems:                                                    #
@@ -718,6 +729,7 @@ TsiChung Liew <Tsi-Chung.Liew@freescale.com>
        M52277EVB       mcf5227x
        M5235EVB        mcf52x2
        M5253DEMO       mcf52x2
+       M53017EVB       mcf532x
        M5329EVB        mcf532x
        M5373EVB        mcf532x
        M54455EVB       mcf5445x