summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorWolfgang Denk <wd@denx.de>2010-10-18 22:29:40 +0200
committerWolfgang Denk <wd@denx.de>2010-10-18 22:29:40 +0200
commit6f119c558bd28e6eb7dcb8edb0266beeabde100e (patch)
tree6c400cc3e24e26656daed2b03bdb95134f0660e4
parentd48455ad8cefd25d7b49f68fd16d0e9fd551732a (diff)
parent9c3c78870f1612fe28231e0588518f4ee189ab3f (diff)
downloadu-boot-imx-6f119c558bd28e6eb7dcb8edb0266beeabde100e.zip
u-boot-imx-6f119c558bd28e6eb7dcb8edb0266beeabde100e.tar.gz
u-boot-imx-6f119c558bd28e6eb7dcb8edb0266beeabde100e.tar.bz2
Merge branch 'master' of /home/wd/git/u-boot/master/
-rw-r--r--MAINTAINERS10
1 files changed, 5 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 5b526c0..5108c54 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -554,6 +554,11 @@ Stefano Babic <sbabic@denx.de>
mx51evk i.MX51
vision2 i.MX51
+Enric Balletbo i Serra <eballetbo@iseebcn.com>
+
+ igep0020 ARM ARMV7 (OMAP3xx SoC)
+ igep0030 ARM ARMV7 (OMAP3xx SoC)
+
Dirk Behme <dirk.behme@gmail.com>
omap3_beagle ARM ARMV7 (OMAP3530 SoC)
@@ -827,11 +832,6 @@ Alex Züpke <azu@sysgo.de>
lart SA1100
dnp1110 SA1110
-Enric Balletbo i Serra <eballetbo@iseebcn.com>
-
- igep0020 ARM ARMV7 (OMAP3xx SoC)
- igep0030 ARM ARMV7 (OMAP3xx SoC)
-
-------------------------------------------------------------------------
Unknown / orphaned boards: