summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorKim Phillips <kim.phillips@freescale.com>2009-01-21 18:38:51 -0600
committerKim Phillips <kim.phillips@freescale.com>2009-01-21 18:38:51 -0600
commitbe4880ebe4355e8782be4af4b337a1b98dffcbe3 (patch)
tree8b699181073305221b95f338a2d9107ab1bbfa3f /MAINTAINERS
parent633639587e3596f0dbf5e6247dd3faf80b1d9063 (diff)
parent72d15e705bc3983884105cb7755c7ba80e74a0a5 (diff)
downloadblackbird-obmc-uboot-be4880ebe4355e8782be4af4b337a1b98dffcbe3.tar.gz
blackbird-obmc-uboot-be4880ebe4355e8782be4af4b337a1b98dffcbe3.zip
Merge branch 'master' into next
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 4 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 40868310bb..d07fe86129 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -412,6 +412,10 @@ Rune Torgersen <runet@innovsys.com>
MPC8266ADS MPC8266
+Peter Tyser <ptyser@xes-inc.com>
+
+ XPEDITE5200 MPC8548
+ XPEDITE5370 MPC8572
David Updegraff <dave@cray.com>
@@ -705,7 +709,6 @@ Yasushi Shoji <yashi@atmark-techno.com>
Michal Simek <monstr@monstr.eu>
ML401 MicroBlaze
- XUPV2P MicroBlaze
#########################################################################
# Coldfire Systems: #
OpenPOWER on IntegriCloud