summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-05-13 09:56:24 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-05-13 09:56:24 +0100
commit74b8721099992b76d3faff78cb8a5d13c65c3529 (patch)
tree2c9971160051cae98237715f791ce2b93a0720b5 /MAINTAINERS
parent4bddaf66093ce0e0c1fce505f091f4cd52e73e2e (diff)
parentbaffe1699c68da5040de6b274054adc995795782 (diff)
downloadlinux-3.10-74b8721099992b76d3faff78cb8a5d13c65c3529.tar.gz
linux-3.10-74b8721099992b76d3faff78cb8a5d13c65c3529.tar.bz2
linux-3.10-74b8721099992b76d3faff78cb8a5d13c65c3529.zip
Merge branch 'devel' of git://git.kernel.org/pub/scm/linux/kernel/git/ycmiao/pxa-linux-2.6 into devel-stable
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS14
1 files changed, 14 insertions, 0 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 27299d13947..5a2387d1333 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1000,6 +1000,20 @@ W: http://www.arm.linux.org.uk/
S: Maintained
F: arch/arm/vfp/
+ARM/VOIPAC PXA270 SUPPORT
+M: Marek Vasut <marek.vasut@gmail.com>
+L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S: Maintained
+F: arch/arm/mach-pxa/vpac270.c
+F: arch/arm/mach-pxa/include/mach-pxa/vpac270.h
+
+ARM/ZIPIT Z2 SUPPORT
+M: Marek Vasut <marek.vasut@gmail.com>
+L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+S: Maintained
+F: arch/arm/mach-pxa/z2.c
+F: arch/arm/mach-pxa/include/mach-pxa/z2.h
+
ASC7621 HARDWARE MONITOR DRIVER
M: George Joseph <george.joseph@fairview5.com>
L: lm-sensors@lm-sensors.org