Remove executable permission for dma.c

[linux-2.6-omap-h63xx.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 60c9706858334270f6673b352d001aae689d92b1..c3b215970f7b439fd83cf1dc2009979c3ce0a84f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1544,7 +1544,6 @@ S:        Maintained
 DVB SUBSYSTEM AND DRIVERS
 P:     LinuxTV.org Project
 M:     linux-media@vger.kernel.org
-L:     linux-dvb@linuxtv.org (subscription required)
 W:     http://linuxtv.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/mchehab/linux-2.6.git
 S:     Maintained
@@ -3051,8 +3050,9 @@ S:        Maintained
 
 MULTIFUNCTION DEVICES (MFD)
 P:     Samuel Ortiz
-M:     sameo@openedhand.com
+M:     sameo@linux.intel.com
 L:     linux-kernel@vger.kernel.org
+T:     git kernel.org:/pub/scm/linux/kernel/git/sameo/mfd-2.6.git
 S:     Supported
 
 MULTIMEDIA CARD (MMC), SECURE DIGITAL (SD) AND SDIO SUBSYSTEM
@@ -3244,6 +3244,13 @@ M:       andi@lisas.de
 L:     netdev@vger.kernel.org
 S:     Maintained
 
+NILFS2 FILESYSTEM
+P:     KONISHI Ryusuke
+M:     konishi.ryusuke@lab.ntt.co.jp
+L:     users@nilfs.org
+W:     http://www.nilfs.org/en/
+S:     Supported
+
 NINJA SCSI-3 / NINJA SCSI-32Bi (16bit/CardBus) PCMCIA SCSI HOST ADAPTER DRIVER
 P:     YOKOTA Hiroshi
 M:     yokota@netlab.is.tsukuba.ac.jp