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

[karo-tx-uboot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index fbd1c0f0bdf68790d7d57542b2433e117e3223cc..4aabcffefffbfec3ef21d0a2f11c68152ac4db78 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -618,7 +618,6 @@ Rishi Bhattacharya <rishi@ti.com>
 Andreas Bießmann <andreas.devel@gmail.com>
 
        at91rm9200ek    at91rm9200
-       grasshopper     avr32
 
 Cliff Brake <cliff.brake@gmail.com>
 
@@ -661,7 +660,7 @@ Daniel Gorsulowski <daniel.gorsulowski@esd.eu>
        meesc           ARM926EJS (AT91SAM9263 SoC)
        otc570          ARM926EJS (AT91SAM9263 SoC)
 
-Sedji Gaouaou<sedji.gaouaou@atmel.com>
+Bo Shen<voice.shen@atmel.com>
        at91sam9g10ek           ARM926EJS (AT91SAM9G10 SoC)
        at91sam9m10g45ek        ARM926EJS (AT91SAM9G45 SoC)
 
@@ -684,6 +683,10 @@ Vaibhav Hiremath <hvaibhav@ti.com>
 
        am3517_evm      ARM ARMV7 (AM35x SoC)
 
+Markus Hubig <mhubig@imko.de>
+
+       STAMP9G20       ARM926EJS
+
 Grazvydas Ignotas <notasas@gmail.com>
 
        omap3_pandora   ARM ARMV7 (OMAP3xx SoC)
@@ -793,6 +796,10 @@ Linus Walleij <linus.walleij@linaro.org>
        integratorap    various
        integratorcp    various
 
+Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
+
+       apx4devkit      i.MX28
+
 Luka Perkov <uboot@lukaperkov.net>
 
        ib62x0          ARM926EJS
@@ -801,6 +808,10 @@ Dave Peverley <dpeverley@mpc-data.co.uk>
 
        omap730p2       ARM926EJS
 
+Mathieu Poirier <mathieu.poirier@linaro.org>
+
+       snowball        ARM ARMV7 (u8500 SoC)
+
 Stelian Pop <stelian@popies.net>
 
        at91sam9260ek   ARM926EJS (AT91SAM9260 SoC)
@@ -820,9 +831,9 @@ Sricharan R <r.sricharan@ti.com>
 
 Thierry Reding <thierry.reding@avionic-design.de>
 
-       plutux          Tegra2 (ARM7 & A9 Dual Core)
-       medcom          Tegra2 (ARM7 & A9 Dual Core)
-       tec             Tegra2 (ARM7 & A9 Dual Core)
+       plutux          Tegra20 (ARM7 & A9 Dual Core)
+       medcom          Tegra20 (ARM7 & A9 Dual Core)
+       tec             Tegra20 (ARM7 & A9 Dual Core)
 
 Christian Riesch <christian.riesch@omicron.at>
 Manfred Rudigier <manfred.rudigier@omicron.at>
@@ -875,6 +886,11 @@ Michael Schwingen <michael@schwingen.org>
        actux4          xscale/ixp
        dvlhost         xscale/ixp
 
+Matt Sealey <matt@genesi-usa.com>
+
+       efikamx         i.MX51
+       efikasb         i.MX51
+
 Bo Shen <voice.shen@atmel.com>
        at91sam9x5ek            ARM926EJS (AT91SAM9G15,G25,G35,X25,X35 SoC)
 
@@ -903,8 +919,7 @@ Marek Vasut <marek.vasut@gmail.com>
        vpac270         xscale/pxa
        zipitz2         xscale/pxa
        m28evk          i.MX28
-       efikamx         i.MX51
-       efikasb         i.MX51
+       sc_sps_1        i.MX28
 
 Hugo Villeneuve <hugo.villeneuve@lyrtech.com>
 
@@ -929,16 +944,20 @@ Michael Walle <michael@walle.cc>
 
 Tom Warren <twarren@nvidia.com>
 
-       harmony         Tegra2 (ARM7 & A9 Dual Core)
-       seaboard        Tegra2 (ARM7 & A9 Dual Core)
+       harmony         Tegra20 (ARM7 & A9 Dual Core)
+       seaboard        Tegra20 (ARM7 & A9 Dual Core)
 
 Tom Warren <twarren@nvidia.com>
 Stephen Warren <swarren@nvidia.com>
 
-       ventana         Tegra2 (ARM7 & A9 Dual Core)
-       paz00           Tegra2 (ARM7 & A9 Dual Core)
-       trimslice       Tegra2 (ARM7 & A9 Dual Core)
-       whistler        Tegra2 (ARM7 & A9 Dual Core)
+       ventana         Tegra20 (ARM7 & A9 Dual Core)
+       paz00           Tegra20 (ARM7 & A9 Dual Core)
+       trimslice       Tegra20 (ARM7 & A9 Dual Core)
+       whistler        Tegra20 (ARM7 & A9 Dual Core)
+
+Stephen Warren <swarren@wwwdotorg.org>
+
+       rpi_b           BCM2835 (ARM1176)
 
 Thomas Weber <weber@corscience.de>
 
@@ -1091,6 +1110,9 @@ Wolfgang Wegner <w.wegner@astro-kom.de>
 #      Board           CPU                                             #
 #########################################################################
 
+Andreas Bießmann <andreas.devel@googlemail.com>
+       grasshopper             AT32AP7000
+
 Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
 
        FAVR-32-EZKIT           AT32AP7000