Make "file" command happy with some config.mk files; update CHANGELOG

[oweals/u-boot.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 2a43848fc992b70a6a9f06c222be12b77c071a09..2eaef1784eaccbf31f6870135a6d1399ebb6d977 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -221,10 +221,11 @@ Jon Loeliger <jdl@freescale.com>
 
        MPC8641HPCN             MPC8641D
 
-Dan Malek <dan@embeddededge.com>
+Dan Malek <dan@embeddedalley.com>
 
-       STxGP3                  MPC85xx
-       STxXTc                  MPC8xx
+       stxgp3                  MPC85xx
+       stxssa                  MPC85xx
+       stxxtc                  MPC8xx
 
 Eran Man <eran@nbase.co.il>
 
@@ -257,15 +258,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 +436,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 +456,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