summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2010-10-08 09:58:55 +0100
committerRussell King <rmk+kernel@arm.linux.org.uk>2010-10-08 09:58:55 +0100
commit552dc340bce3b28f4af33c9134adafa5efacf1c9 (patch)
tree8ec5d6d4f7462e92baa0732aa2c47cc33a0b851c /MAINTAINERS
parenta9fda02bfc91a281cd812ae15dabe6bfb9574f90 (diff)
parentee621dd619b9a85eced150fc06e352fef54cfda0 (diff)
downloadlinux-3.10-552dc340bce3b28f4af33c9134adafa5efacf1c9.tar.gz
linux-3.10-552dc340bce3b28f4af33c9134adafa5efacf1c9.tar.bz2
linux-3.10-552dc340bce3b28f4af33c9134adafa5efacf1c9.zip
Merge branch 'for_rmk' of git://github.com/at91linux/linux-2.6-at91 into devel-stable
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS14
1 files changed, 10 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 1358e3742e8..0c737460f7e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -962,6 +962,13 @@ W: http://www.fluff.org/ben/linux/
S: Maintained
F: arch/arm/mach-s3c6410/
+ARM/S5P ARM ARCHITECTURES
+M: Kukjin Kim <kgene.kim@samsung.com>
+L: linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
+L: linux-samsung-soc@vger.kernel.org (moderated for non-subscribers)
+S: Maintained
+F: arch/arm/mach-s5p*/
+
ARM/SHMOBILE ARM ARCHITECTURE
M: Paul Mundt <lethal@linux-sh.org>
M: Magnus Damm <magnus.damm@gmail.com>
@@ -3788,9 +3795,8 @@ W: http://www.syskonnect.com
S: Supported
MATROX FRAMEBUFFER DRIVER
-M: Petr Vandrovec <vandrove@vc.cvut.cz>
L: linux-fbdev@vger.kernel.org
-S: Maintained
+S: Orphan
F: drivers/video/matrox/matroxfb_*
F: include/linux/matroxfb.h
@@ -3977,8 +3983,8 @@ S: Maintained
F: drivers/net/natsemi.c
NCP FILESYSTEM
-M: Petr Vandrovec <vandrove@vc.cvut.cz>
-S: Maintained
+M: Petr Vandrovec <petr@vandrovec.name>
+S: Odd Fixes
F: fs/ncpfs/
NCR DUAL 700 SCSI DRIVER (MICROCHANNEL)