summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-08-06 15:12:38 +0200
committerHaavard Skinnemoen <haavard.skinnemoen@atmel.com>2008-08-06 15:12:38 +0200
commit7772c13ba07eaabd42499998f3713b23350fc119 (patch)
tree32718a8e67114d0ea5dbdb1fdcf58aad09dd52dc /MAINTAINERS
parentb2b15ebb66f0e7958dff8916077da0aceb2982a8 (diff)
parent0eb5717a85b6cba3f67c11fa89bdde38dcd081b5 (diff)
downloadu-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.zip
u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.tar.gz
u-boot-imx-7772c13ba07eaabd42499998f3713b23350fc119.tar.bz2
Merge branch 'favr-32' of git://git.denx.de/u-boot-avr32
Conflicts: MAINTAINERS MAKEALL Makefile
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS14
1 files changed, 9 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index bcac300..10a25e1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -62,7 +62,7 @@ Joe D'Abbraccio <ljd015@freescale.com>
MPC837xERDB MPC837x
-Kári Davíðsson <kd@flaga.is>
+K�ri Dav��sson <kd@flaga.is>
FLAGADM MPC823
@@ -482,7 +482,7 @@ Peter Figuli <peposh@etc.sk>
wepep250 xscale
-Marius Gröger <mag@sysgo.de>
+Marius Gr�ger <mag@sysgo.de>
impa7 ARM720T (EP7211)
ep7312 ARM720T (EP7312)
@@ -514,7 +514,7 @@ Prakash Kumar <prakash@embedx.com>
cerf250 xscale
-David Müller <d.mueller@elsoft.ch>
+David M�ller <d.mueller@elsoft.ch>
smdk2410 ARM920T
VCMA9 ARM920T
@@ -570,7 +570,7 @@ Kyungmin Park <kyungmin.park@samsung.com>
apollon ARM1136EJS
-Alex Züpke <azu@sysgo.de>
+Alex Z�pke <azu@sysgo.de>
lart SA1100
dnp1110 SA1110
@@ -598,7 +598,7 @@ Unknown / orphaned boards:
# Board CPU #
#########################################################################
-Daniel Engström <daniel@omicron.se>
+Daniel Engstr�m <daniel@omicron.se>
sc520_cdp x86
@@ -714,6 +714,10 @@ Julien May <julien.may@miromico.ch>
HAMMERHEAD AT32AP7000
+Hans-Christian Egtvedt <hans-christian.egtvedt@atmel.com>
+
+ FAVR-32-EZKIT AT32AP7000
+
#########################################################################
# SuperH Systems: #
# #