Merge branch 'master' of /home/stefan/git/u-boot/u-boot into next

[platform/kernel/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 58e9aa8..7efef6a 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -239,6 +239,10 @@ The LEOX team <team@leox.org>
 
        ELPT860         MPC860T
 
+Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+
+       linkstation     MPC8241
+
 Dave Liu <daveliu@freescale.com>
 
        MPC8315ERDB     MPC8315
@@ -416,13 +420,13 @@ Stephen Williams <steve@icarus.com>
 
        JSE             PPC405GPr
 
-John Zhan <zhanz@sinovee.com>
+Roy Zang <tie-fei.zang@freescale.com>
 
-       svm_sc8xx       MPC8xx
+       mpc7448hpc2     MPC7448
 
-Guennadi Liakhovetski <g.liakhovetski@gmx.de>
+John Zhan <zhanz@sinovee.com>
 
-       linkstation     MPC8241
+       svm_sc8xx       MPC8xx
 
 Feng Kan <fkan@amcc.com>
 
@@ -530,6 +534,10 @@ Rolf Offermanns <rof@sysgo.de>
 
        shannon         SA1100
 
+Kyungmin Park <kyungmin.park@samsung.com>
+
+       apollon         ARM1136EJS
+
 Peter Pearse <peter.pearse@arm.com>
        integratorcp    All current ARM supplied & supported core modules
                        -see http://www.arm.com/products/DevTools/Hardware_Platforms.html
@@ -559,6 +567,13 @@ Robert Schwebel <r.schwebel@pengutronix.de>
        csb226          xscale
        innokom         xscale
 
+Michael Schwingen <michael@schwingen.org>
+
+       actux1          xscale
+       actux2          xscale
+       actux3          xscale
+       actux4          xscale
+
 Andrea Scian <andrea.scian@dave-tech.it>
 
        B2              ARM7TDMI (S3C44B0X)
@@ -573,22 +588,11 @@ Richard Woodruff <r-woodruff2@ti.com>
 
        omap2420h4      ARM1136EJS
 
-Kyungmin Park <kyungmin.park@samsung.com>
-
-       apollon         ARM1136EJS
-
 Alex Züpke <azu@sysgo.de>
 
        lart            SA1100
        dnp1110         SA1110
 
-Michael Schwingen <michael@schwingen.org>
-
-       actux1          xscale
-       actux2          xscale
-       actux3          xscale
-       actux4          xscale
-
 -------------------------------------------------------------------------
 
 Unknown / orphaned boards:
@@ -686,6 +690,10 @@ Matthias Fuchs <matthias.fuchs@esd-electronics.com>
 
        TASREG          MCF5249
 
+Hayden Fraser <Hayden.Fraser@freescale.com>
+
+       M5253EVBE       mcf52x2
+
 TsiChung Liew <Tsi-Chung.Liew@freescale.com>
 
        M52277EVB       mcf5227x
@@ -696,10 +704,6 @@ TsiChung Liew <Tsi-Chung.Liew@freescale.com>
        M5475EVB        mcf547x_8x
        M5485EVB        mcf547x_8x
 
-Hayden Fraser <Hayden.Fraser@freescale.com>
-
-       M5253EVBE       mcf52x2
-
 #########################################################################
 # AVR32 Systems:                                                       #
 #                                                                      #
@@ -723,6 +727,10 @@ Haavard Skinnemoen <hskinnemoen@atmel.com>
 #      Board           CPU                                             #
 #########################################################################
 
+Yusuke Goda <goda.yusuke@renesas.com>
+
+       MIGO-R          SH7722
+
 Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
 
        MS7750SE        SH7750
@@ -739,10 +747,6 @@ Yoshihiro Shimoda <shimoda.yoshihiro@renesas.com>
 
        MS7720SE        SH7720
 
-Yusuke Goda <goda.yusuke@renesas.com>
-
-       MIGO-R          SH7722
-
 #########################################################################
 # Blackfin Systems:                                                    #
 #                                                                      #