aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@g5.osdl.org>2005-11-06 16:58:11 -0800
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-06 16:58:11 -0800
commitb54a063df48cb1296f744b5ba456c45ce7efff35 (patch)
tree72e71bfb6008f460f887a208d046cd82e5545ff5 /MAINTAINERS
parentMerge master.kernel.org:/home/rmk/linux-2.6-serial (diff)
parent[ARM] Fix /proc/cpuinfo format for ARM SMP (diff)
downloadlinux-dev-b54a063df48cb1296f744b5ba456c45ce7efff35.tar.xz
linux-dev-b54a063df48cb1296f744b5ba456c45ce7efff35.zip
Merge master.kernel.org:/home/rmk/linux-2.6-arm
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index f08a1434b217..d57c491212b1 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -297,6 +297,11 @@ P: Richard Purdie
M: rpurdie@rpsys.net
S: Maintained
+ARM/TOSA MACHINE SUPPORT
+P: Dirk Opfer
+M: dirk@opfer-online.de
+S: Maintained
+
ARM/PLEB SUPPORT
P: Peter Chubb
M: pleb@gelato.unsw.edu.au