aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-10 00:12:13 -0800
committerLinus Torvalds <torvalds@ppc970.osdl.org>2005-01-10 00:12:13 -0800
commit73ef2d644741787f8054e69c4c52d471bd68617f (patch)
tree87cd6c15c8fc00ff7ac0112fabd52bf607919bf6 /MAINTAINERS
parenta9625ef18290632e9b2abf9e63bb90c0b9cb64a6 (diff)
parentd5051a39b04a6401fa0fb9ea42a889485493dffc (diff)
downloadhistory-73ef2d644741787f8054e69c4c52d471bd68617f.tar.gz
Merge bk://bk.arm.linux.org.uk/linux-2.6-rmk
into ppc970.osdl.org:/home/torvalds/v2.6/linux
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 5 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 3d25b37db0bba9..6b81b36457d314 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -287,6 +287,11 @@ P: Dave Gilbert
M: linux@treblig.org
S: Maintained
+ARM/CORGI MACHINE SUPPORT
+P: Richard Purdie
+M: rpurdie@rpsys.net
+S: Maintained
+
ARM/PLEB SUPPORT
P: Peter Chubb
M: pleb@gelato.unsw.edu.au