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

[u-boot] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c3157d95b6d0ddb7608ca302c740275d43c07e47..03d59b9317cfeb585ff3375ce73834974acd826a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -219,6 +219,10 @@ Larry Johnson <lrj@acm.org>
 
        korat           PPC440EPx
 
+Feng Kan <fkan@amcc.com>
+
+       redwood                 PPC4xx
+
 Brad Kemp <Brad.Kemp@seranoa.com>
 
        ppmc8260        MPC8260
@@ -380,6 +384,7 @@ Heiko Schocher <hs@denx.de>
        ids8247         MPC8247
        jupiter         MPC5200
        kmeter1         MPC8360
+       kmsupx4         MPC852T
        mgcoge          MPC8247
        mgsuvd          MPC852
        mucmc52         MPC5200
@@ -447,9 +452,10 @@ John Zhan <zhanz@sinovee.com>
 
        svm_sc8xx       MPC8xx
 
-Feng Kan <fkan@amcc.com>
+Detlev Zundel <dzu@denx.de>
+
+       inka4x0         MPC5200
 
-       redwood                 PPC4xx
 -------------------------------------------------------------------------
 
 Unknown / orphaned boards:
@@ -508,6 +514,9 @@ George G. Davis <gdavis@mvista.com>
        assabet         SA1100
        gcplus          SA1100
 
+Wolfgang Denk <wd@denx.de>
+       qong            i.MX31
+
 Thomas Elste <info@elste.org>
 
        modnet50        ARM720T (NET+50)
@@ -559,8 +568,9 @@ Prakash Kumar <prakash@embedx.com>
 
 Guennadi Liakhovetski <g.liakhovetski@gmx.de>
 
-       mx31ads         i.MX31
-       SMDK6400        S3C6400
+       imx31_phycore_eet       i.MX31
+       mx31ads                 i.MX31
+       SMDK6400                S3C6400
 
 Nishanth Menon <nm@ti.com>
 
@@ -655,9 +665,6 @@ Sergey Lapin <slapin@ossfans.org>
 
        afeb9260        ARM926EJS (AT91SAM9260 SoC)
 
-Wolfgang Denk <wd@denx.de>
-       qong            i.MX31
-
 -------------------------------------------------------------------------
 
 Unknown / orphaned boards:
@@ -848,9 +855,14 @@ Yusuke Goda <goda.yusuke@renesas.com>
 Mike Frysinger <vapier@gentoo.org>
 Blackfin Team <u-boot-devel@blackfin.uclinux.org>
 
+       BF518F-EZBRD    BF518
+       BF526-EZBRD     BF526
+       BF527-EZKIT     BF527
        BF533-EZKIT     BF533
        BF533-STAMP     BF533
        BF537-STAMP     BF537
+       BF538F-EZKIT    BF538
+       BF548-EZKIT     BF548
        BF561-EZKIT     BF561
 
 #########################################################################