Merge u-boot/master into u-boot-ti/master

[oweals/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d3ed3905eac3fa66d73460c47de326c29ac68a5b..e792a8b4f6557ffcc9595d2e215199b1775161f8 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -607,6 +607,7 @@ Enric Balletbo i Serra <eballetbo@iseebcn.com>
 
        igep0020        ARM ARMV7 (OMAP3xx SoC)
        igep0030        ARM ARMV7 (OMAP3xx SoC)
+       igep0032        ARM ARMV7 (OMAP3xx SoC)
 
 Eric Benard <eric@eukrea.com>
 
@@ -819,6 +820,9 @@ Dave Peverley <dpeverley@mpc-data.co.uk>
 
        omap730p2       ARM926EJS
 
+Lars Poeschel <poeschel@lemonage.de>
+       pcm051          ARM ARMV7 (AM33xx Soc)
+
 Mathieu Poirier <mathieu.poirier@linaro.org>
 
        snowball        ARM ARMV7 (u8500 SoC)
@@ -939,6 +943,7 @@ Marek Vasut <marek.vasut@gmail.com>
        palmtc          xscale/pxa
        vpac270         xscale/pxa
        zipitz2         xscale/pxa
+       mx23_olinuxino  i.MX23
        m28evk          i.MX28
        sc_sps_1        i.MX28
 
@@ -950,6 +955,10 @@ Matt Waddel <matt.waddel@linaro.org>
 
        ca9x4_ct_vxp    ARM ARMV7 (Quad Core)
 
+Otavio Salvador <otavio@ossystems.com.br>
+
+       mx23evk         i.MX23
+
 Prafulla Wadaskar <prafulla@marvell.com>
 
        aspenite        ARM926EJS (ARMADA100 88AP168 SoC)
@@ -1218,7 +1227,7 @@ Yoshihiro Shimoda <yoshihiro.shimoda.uh@renesas.com>
 #      Board           CPU                                             #
 #########################################################################
 
-Mike Frysinger <vapier@gentoo.org>
+Sonic Zhang <sonic.adi@gmail.com>
 Blackfin Team <u-boot-devel@blackfin.uclinux.org>
 
        BF506F-EZKIT    BF506
@@ -1235,6 +1244,7 @@ Blackfin Team <u-boot-devel@blackfin.uclinux.org>
        BF538F-EZKIT    BF538
        BF548-EZKIT     BF548
        BF561-EZKIT     BF561
+       BF609-EZKIT     BF609
 
 M.Hasewinkel (MHA) <info@ssv-embedded.de>