Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'

[karo-tx-uboot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3e70b037bf919973386bfc82cc43e93d07f8b303..86a5ce402eb46d11d28e2e90f868955bc6a98456 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -160,8 +160,9 @@ egnite GmbH <info@egnite.de>
 
 Dirk Eibach <eibach@gdsys.de>
 
+       controlcenterd  P1022
        devconcenter    PPC460EX
-       dlvision        PPC405EP
+       dlvision        PPC405EP
        dlvision-10g    PPC405EP
        gdppc440etx     PPC440EP/GR
        intip           PPC460EX
@@ -183,7 +184,6 @@ Matthias Fuchs <matthias.fuchs@esd-electronics.com>
        APC405          PPC405GP
        AR405           PPC405GP
        ASH405          PPC405EP
-       CANBT           PPC405CR
        CPCI2DP         PPC405GP
        CPCI405         PPC405GP
        CPCI4052        PPC405GP
@@ -447,6 +447,7 @@ Heiko Schocher <hs@denx.de>
        cam_enc_4xx     davinci/ARM926EJS
        charon          MPC5200
        ids8247         MPC8247
+       ipam390         davinci/ARM926EJS
        jupiter         MPC5200
        kmsupx5         MPC8321
        mucmc52         MPC5200
@@ -463,6 +464,10 @@ Andre Schwarz <andre.schwarz@matrix-vision.de>
        mvblm7          MPC8343
        mvsmr           MPC5200
 
+Inderpal Singh <inderpal.singh@linaro.org>
+
+       Arndale         ARM ARMV7 (EXYNOS5250 SoC)
+
 Jon Smirl <jonsmirl@gmail.com>
 
        pcm030          MPC5200
@@ -471,6 +476,10 @@ Ira W. Snyder <iws@ovro.caltech.edu>
 
        P2020COME       P2020
 
+York Sun <yorksun@freescale.com>
+
+       T4240EMU        T4240
+
 Timur Tabi <timur@freescale.com>
 
        MPC8349E-mITX   MPC8349
@@ -538,6 +547,10 @@ Detlev Zundel <dzu@denx.de>
 
        inka4x0         MPC5200
 
+Po Liu <po.liu@freescale.com>
+
+       C29XPCIE        C29X
+
 -------------------------------------------------------------------------
 
 Unknown / orphaned boards:
@@ -600,7 +613,6 @@ Jason Liu <r64343@freescale.com>
        mx53evk         i.MX53
        mx53loco        i.MX53
        mx6qarm2        i.MX6Q
-       mx6qsabrelite   i.MX6Q
 
 Enric Balletbo i Serra <eballetbo@iseebcn.com>
 
@@ -943,6 +955,10 @@ Lucas Stach <dev@lynxeye.de>
 
        colibri_t20_iris        Tegra20 (ARM7 & A9 Dual Core)
 
+Antoine Tenart <atenart@adeneo-embedded.com>
+
+       TI816X          ARM ARMV7 (TI816x Soc)
+
 Nick Thompson <nick.thompson@gefanuc.com>
 
        da830evm        ARM926EJS (DA830/OMAP-L137)
@@ -1066,6 +1082,7 @@ Pali Rohár <pali.rohar@gmail.com>
        nokia_rx51      ARM ARMV7 (OMAP34xx SoC)
 
 Eric Nelson <eric.nelson@boundarydevices.com>
+       mx6qsabrelite           i.MX6Q          1GB
        nitrogen6dl             i.MX6DL         1GB
        nitrogen6dl2g           i.MX6DL         2GB
        nitrogen6q              i.MX6Q/6D       1GB
@@ -1081,6 +1098,11 @@ Sergey Yanovich <ynvich@gmail.com>
 
        lp8x4x          xscale/pxa
 
+Roger Meier <r.meier@siemens.com>
+       dxr2                    ARM ARMV7 (AM335x SoC)
+       pxm2                    ARM ARMV7 (AM335x SoC)
+       rut                     ARM ARMV7 (AM335x SoC)
+
 -------------------------------------------------------------------------
 
 Unknown / orphaned boards:
@@ -1133,10 +1155,6 @@ Stefan Roese <sr@denx.de>
 
        vct_xxx         MIPS32 4Kc
 
-Xiangfu Liu <xiangfu@openmobilefree.net>
-
-       qi_lb60         MIPS32 (XBurst Jz4740 SoC)
-
 -------------------------------------------------------------------------
 
 Unknown / orphaned boards:
@@ -1361,7 +1379,7 @@ Dimitar Penev <dpn@switchfin.org>
 #      Board           CPU                                             #
 #########################################################################
 
-Macpaul Lin <macpaul@andestech.com>
+Andes <uboot@andestech.com>
 
        ADP-AG101       N1213 (AG101 SoC)
        ADP-AG101P      N1213 (AG101P XC5 FPGA)