Merge with git://www.denx.de/git/u-boot.git

[karo-tx-uboot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2a43848fc992b70a6a9f06c222be12b77c071a09..c3c73da4f77bb96df63d2cea5d2645b5f42e8838 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -257,15 +257,6 @@ Frank Panno <fpanno@delphintech.com>
 
        ep8260                  MPC8260
 
-Peter Pearse <peter.pearse@arm.com>
-       integratorcp            All current ARM supplied &
-                               supported core modules
-                               - see http://www.arm.com
-                               /products/DevTools
-                               /Hardware_Platforms.html
-       versatile               ARM926EJ-S
-       versatile               ARM926EJ-S
-
 Denis Peter <d.peter@mpl.ch>
 
        MIP405                  PPC4xx
@@ -444,6 +435,9 @@ Gary Jennejohn <gj@denx.de>
        smdk2400                ARM920T
        trab                    ARM920T
 
+Konstantin Kletschke <kletschke@synertronixx.de>
+       scb9328                 ARM920T
+
 Nishant Kamat <nskamat@ti.com>
 
        omap1610h2              ARM926EJS
@@ -461,6 +455,15 @@ Rolf Offermanns <rof@sysgo.de>
 
        shannon                 SA1100
 
+Peter Pearse <peter.pearse@arm.com>
+       integratorcp            All current ARM supplied &
+                               supported core modules
+                               -see http://www.arm.com
+                               /products/DevTools
+                               /Hardware_Platforms.html
+       versatile               ARM926EJ-S
+       versatile               ARM926EJ-S
+
 Dave Peverley <dpeverley@mpc-data.co.uk>
 
        omap730p2               ARM926EJS