aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorOlof Johansson <olof@lixom.net>2012-03-07 17:52:43 -0500
committerOlof Johansson <olof@lixom.net>2012-03-07 17:53:14 -0500
commit591e7afd2e686394912d65a6faeb933b76b26b5d (patch)
tree5e992381e6d9456d6293d16ad1c2ed36efcb7bd3 /MAINTAINERS
parentff0ea1ee058e3906502452eba60fd220ece4401d (diff)
parentc9f46a850a07dcf45ee195b958593fae1b78c221 (diff)
Merge branch 'maintainers' of git://gitorious.org/linux-davinci/linux-davinci into next/maintainers
* 'maintainers' of git://gitorious.org/linux-davinci/linux-davinci: (2 commits) MAINTAINERS: add TI DaVinci git tree information MAINTAINERS: mark TI DaVinci list as "moderated" (also included an update to 3.3-rc6) Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS9
1 files changed, 5 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 086c54b25d2b..b0e8362595ab 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3779,7 +3779,7 @@ F: Documentation/kdump/
3779 3779
3780KERNEL AUTOMOUNTER v4 (AUTOFS4) 3780KERNEL AUTOMOUNTER v4 (AUTOFS4)
3781M: Ian Kent <raven@themaw.net> 3781M: Ian Kent <raven@themaw.net>
3782L: autofs@linux.kernel.org 3782L: autofs@vger.kernel.org
3783S: Maintained 3783S: Maintained
3784F: fs/autofs4/ 3784F: fs/autofs4/
3785 3785
@@ -4684,7 +4684,7 @@ NTFS FILESYSTEM
4684M: Anton Altaparmakov <anton@tuxera.com> 4684M: Anton Altaparmakov <anton@tuxera.com>
4685L: linux-ntfs-dev@lists.sourceforge.net 4685L: linux-ntfs-dev@lists.sourceforge.net
4686W: http://www.tuxera.com/ 4686W: http://www.tuxera.com/
4687T: git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs-2.6.git 4687T: git git://git.kernel.org/pub/scm/linux/kernel/git/aia21/ntfs.git
4688S: Supported 4688S: Supported
4689F: Documentation/filesystems/ntfs.txt 4689F: Documentation/filesystems/ntfs.txt
4690F: fs/ntfs/ 4690F: fs/ntfs/
@@ -5981,7 +5981,8 @@ F: arch/arm/mach-s3c2410/bast-irq.c
5981TI DAVINCI MACHINE SUPPORT 5981TI DAVINCI MACHINE SUPPORT
5982M: Sekhar Nori <nsekhar@ti.com> 5982M: Sekhar Nori <nsekhar@ti.com>
5983M: Kevin Hilman <khilman@ti.com> 5983M: Kevin Hilman <khilman@ti.com>
5984L: davinci-linux-open-source@linux.davincidsp.com (subscribers-only) 5984L: davinci-linux-open-source@linux.davincidsp.com (moderated for non-subscribers)
5985T: git git://gitorious.org/linux-davinci/linux-davinci.git
5985Q: http://patchwork.kernel.org/project/linux-davinci/list/ 5986Q: http://patchwork.kernel.org/project/linux-davinci/list/
5986S: Supported 5987S: Supported
5987F: arch/arm/mach-davinci 5988F: arch/arm/mach-davinci
@@ -7270,7 +7271,7 @@ WATCHDOG DEVICE DRIVERS
7270M: Wim Van Sebroeck <wim@iguana.be> 7271M: Wim Van Sebroeck <wim@iguana.be>
7271L: linux-watchdog@vger.kernel.org 7272L: linux-watchdog@vger.kernel.org
7272W: http://www.linux-watchdog.org/ 7273W: http://www.linux-watchdog.org/
7273T: git git://git.kernel.org/pub/scm/linux/kernel/git/wim/linux-2.6-watchdog.git 7274T: git git://www.linux-watchdog.org/linux-watchdog.git
7274S: Maintained 7275S: Maintained
7275F: Documentation/watchdog/ 7276F: Documentation/watchdog/
7276F: drivers/watchdog/ 7277F: drivers/watchdog/