Merge branch 'master' of ../master into next

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

diff --git a/MAINTAINERS b/MAINTAINERS
index 5108c54..ba87436 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -102,7 +102,6 @@ Wolfgang Denk <wd@denx.de>
        IVMS8_256       MPC860
        LANTEC          MPC850
        LWMON           MPC823
-       NC650           MPC852
        R360MPI         MPC823
        RMU             MPC850
        RRvision        MPC823
@@ -145,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>
@@ -309,10 +310,11 @@ Tirumala Marri <tmarri@apm.com>
 
        bluestone       APM821XX
 
-Reinhard Meyer <r.meyer@emk-elektronik.de>
+Reinhard Meyer <reinhard.meyer@emk-elektronik.de>
 
        TOP860          MPC860T
        TOP5200         MPC5200
+       TOP9000         ARM926EJS (AT91SAM9xxx SoC)
 
 Tolunay Orkun <torkun@nextio.com>
 
@@ -413,6 +415,7 @@ Georg Schardt <schardt@team-ctech.de>
 
 Heiko Schocher <hs@denx.de>
 
+       charon          MPC5200
        ids8247         MPC8247
        jupiter         MPC5200
        kmeter1         MPC8360
@@ -463,10 +466,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>
 
@@ -522,8 +526,6 @@ Unknown / orphaned boards:
        RPXClassic      MPC8xx
        RPXlite         MPC8xx
 
-       ERIC            PPC4xx
-
        MOUSSE          MPC824x
 
        RPXsuper        MPC8260
@@ -549,6 +551,7 @@ Rowel Atienza <rowel@diwalabs.com>
 
 Stefano Babic <sbabic@denx.de>
 
+       ea20            davinci
        polaris         xscale
        trizepsiv       xscale
        mx51evk         i.MX51
@@ -573,6 +576,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
@@ -585,6 +592,10 @@ Po-Yu Chuang <ratbert@faraday-tech.com>
 
        a320evb         FA526 (ARM920T-like) (a320 SoC)
 
+Eric Cooper <ecc@cmu.edu>
+
+       dockstar        ARM926EJS (Kirkwood SoC)
+
 George G. Davis <gdavis@mvista.com>
 
        assabet         SA1100
@@ -598,6 +609,10 @@ Thomas Elste <info@elste.org>
 
        modnet50        ARM720T (NET+50)
 
+Kristoffer Ericson <kristoffer.ericson@gmail.com>
+
+       jornada SA1110
+
 Fabio Estevam <Fabio.Estevam@freescale.com>
 
        mx31pdk         i.MX31
@@ -805,6 +820,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
@@ -832,6 +856,11 @@ Alex Z
        lart            SA1100
        dnp1110         SA1110
 
+Syed Mohammed Khasim <sm.khasim@gmail.com>
+Sughosh Ganu <urwithsughosh@gmail.com>
+
+       hawkboard       ARM926EJS (OMAP-L138)
+
 -------------------------------------------------------------------------
 
 Unknown / orphaned boards: