Merge branch 'master' of git://git.denx.de/u-boot-ubi
diff --git a/MAINTAINERS b/MAINTAINERS
index 705bac5..0041112 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -583,6 +583,10 @@
cerf250 xscale
+Sergey Lapin <slapin@ossfans.org>
+
+ afeb9260 ARM926EJS (AT91SAM9260 SoC)
+
Guennadi Liakhovetski <g.liakhovetski@gmx.de>
imx31_phycore_eet i.MX31
@@ -682,10 +686,6 @@
lart SA1100
dnp1110 SA1110
-Sergey Lapin <slapin@ossfans.org>
-
- afeb9260 ARM926EJS (AT91SAM9260 SoC)
-
-------------------------------------------------------------------------
Unknown / orphaned boards:
@@ -782,14 +782,14 @@
# Board CPU #
#########################################################################
-Matthias Fuchs <matthias.fuchs@esd-electronics.com>
-
- TASREG MCF5249
-
Hayden Fraser <Hayden.Fraser@freescale.com>
M5253EVBE mcf52x2
+Matthias Fuchs <matthias.fuchs@esd-electronics.com>
+
+ TASREG MCF5249
+
TsiChung Liew <Tsi-Chung.Liew@freescale.com>
M52277EVB mcf5227x
@@ -862,10 +862,6 @@
MS7720SE SH7720
R0P77850011RL SH7785
-Yusuke Goda <goda.yusuke@renesas.com>
-
- MIGO-R SH7722
-
#########################################################################
# Blackfin Systems: #
# #