summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-10-03 16:44:29 +0200
committerAlbert ARIBAUD <albert.u.boot@aribaud.net>2012-10-03 16:44:29 +0200
commit386c6cb10d644cf51d764223fe2fcaaae4ac2b75 (patch)
treecbbf7726ebbbf4f51785531dc42ee005ba27d429 /MAINTAINERS
parentb77026225a319066eaaa11839121a273469a2cf4 (diff)
parent9bd2317b450d379f4b8162e7dbb9997bf3a14dff (diff)
downloadtalos-obmc-uboot-386c6cb10d644cf51d764223fe2fcaaae4ac2b75.tar.gz
talos-obmc-uboot-386c6cb10d644cf51d764223fe2fcaaae4ac2b75.zip
Merge remote-tracking branch 'u-boot-marvell/master'
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS1
1 files changed, 1 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 110a6c28c9..842ff57ea5 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -803,6 +803,7 @@ Veli-Pekka Peltola <veli-pekka.peltola@bluegiga.com>
Luka Perkov <uboot@lukaperkov.net>
ib62x0 ARM926EJS
+ iconnect ARM926EJS
Dave Peverley <dpeverley@mpc-data.co.uk>
OpenPOWER on IntegriCloud