summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2009-04-06 09:57:38 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2009-04-06 09:57:38 +0100
commit89de3820c7ae615345c093ae6fddac01f326fdc4 (patch)
tree3e433ef080c3e1b691914a33d2d9e674f0744b47 /MAINTAINERS
parent3ef48fac6e8e2362a4e6ef31dd043c89fe107875 (diff)
parent80748fb8ff3bc068dccacb690cd2eb417b034ec7 (diff)
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9673cd28a69..4e7da96333f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -636,7 +636,7 @@ P: Dirk Opfer
M: dirk@opfer-online.de
S: Maintained
-ARM/PALMTX,PALMT5,PALMLD SUPPORT
+ARM/PALMTX,PALMT5,PALMLD,PALMTE2 SUPPORT
P: Marek Vasut
M: marek.vasut@gmail.com
W: http://hackndev.com