Merge branch 'u-boot-samsung/master' into 'u-boot-arm/master'
[karo-tx-uboot.git] / MAINTAINERS
index 9700ec9..86a5ce4 100644 (file)
@@ -184,7 +184,6 @@ Matthias Fuchs <matthias.fuchs@esd-electronics.com>
        APC405          PPC405GP
        AR405           PPC405GP
        ASH405          PPC405EP
-       CANBT           PPC405CR
        CPCI2DP         PPC405GP
        CPCI405         PPC405GP
        CPCI4052        PPC405GP
@@ -477,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
@@ -544,6 +547,10 @@ Detlev Zundel <dzu@denx.de>
 
        inka4x0         MPC5200
 
+Po Liu <po.liu@freescale.com>
+
+       C29XPCIE        C29X
+
 -------------------------------------------------------------------------
 
 Unknown / orphaned boards:
@@ -1091,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:
@@ -1367,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)