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

[karo-tx-uboot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index f5e5ad73fe287b88d902d95ca41bf183942d61ff..9258cb12732f23cfa8de54ea7d02a79f7c359be8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -144,6 +144,8 @@ Dirk Eibach <eibach@gdsys.de>
        dlvision        PPC405EP
        gdppc440etx     PPC440EP/GR
        intip           PPC460EX
+       io              PPC405EP
+       iocon           PPC405EP
        neo             PPC405EP
 
 Dave Ellis <DGE@sixnetio.com>
@@ -462,10 +464,11 @@ Rune Torgersen <runet@innovsys.com>
 
 Peter Tyser <ptyser@xes-inc.com>
 
-       XPEDITE1000     PPC440GX
-       XPEDITE5170     MPC8640
-       XPEDITE5200     MPC8548
-       XPEDITE5370     MPC8572
+       xpedite1000     PPC440GX
+       xpedite5170     MPC8640
+       xpedite5200     MPC8548
+       xpedite5370     MPC8572
+       xpedite5500     P2020
 
 David Updegraff <dave@cray.com>
 
@@ -572,6 +575,10 @@ Rishi Bhattacharya <rishi@ti.com>
 
        omap5912osk     ARM926EJS
 
+Andreas Bießmann <andreas.devel@gmail.com>
+
+       at91rm9200ek    at91rm9200
+
 Cliff Brake <cliff.brake@gmail.com>
 
        pxa255_idp      xscale
@@ -808,6 +815,15 @@ Greg Ungerer <greg.ungerer@opengear.com>
        cm4116          ks8695p
        cm4148          ks8695p
 
+Marek Vasut <marek.vasut@gmail.com>
+
+       balloon3        xscale
+       colibri_pxa270  xscale
+       palmld          xscale
+       palmtc          xscale
+       vpac270         xscale
+       zipitz2         xscale
+
 Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
 
        SFFSDR          ARM926EJS