aboutsummaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk@dyn-67.arm.linux.org.uk>2008-10-07 19:07:22 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-10-07 19:07:22 +0100
commit1543966a079fc7065849ae43ca4dd767c188ad55 (patch)
tree760ddb82836a4e3edf314227c731d5dc181d11a7 /MAINTAINERS
parent5ff7f78a3db462ea4edf1a781a2002d4e8a8a473 (diff)
parent4e9687d9c843dc34d368358a36f5f1610e4fbab3 (diff)
downloadlinux-linaro-stable-1543966a079fc7065849ae43ca4dd767c188ad55.tar.gz
Merge branch 'pxa-palm' into pxa-machines
Conflicts: drivers/mfd/Kconfig drivers/pcmcia/Makefile
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS6
1 files changed, 6 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d02ee7b6cd91..96b0137a575c 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -623,6 +623,12 @@ M: marek.vasut@gmail.com
W: http://hackndev.com
S: Maintained
+ARM/PALMZ72 SUPPORT
+P: Sergey Lapin
+M: slapin@ossfans.org
+W: http://hackndev.com
+S: Maintained
+
ARM/PLEB SUPPORT
P: Peter Chubb
M: pleb@gelato.unsw.edu.au