aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS8
1 files changed, 4 insertions, 4 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 9c592aa0280c..8db5c339845d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -838,7 +838,6 @@ S: Maintained
838 838
839DVB SUBSYSTEM AND DRIVERS 839DVB SUBSYSTEM AND DRIVERS
840P: LinuxTV.org Project 840P: LinuxTV.org Project
841M: mchehab@infradead.org
842M: v4l-dvb-maintainer@linuxtv.org 841M: v4l-dvb-maintainer@linuxtv.org
843L: linux-dvb@linuxtv.org (subscription required) 842L: linux-dvb@linuxtv.org (subscription required)
844W: http://linuxtv.org/ 843W: http://linuxtv.org/
@@ -1632,8 +1631,8 @@ S: Supported
1632 1631
1633LINUX SECURITY MODULE (LSM) FRAMEWORK 1632LINUX SECURITY MODULE (LSM) FRAMEWORK
1634P: Chris Wright 1633P: Chris Wright
1635M: chrisw@osdl.org 1634M: chrisw@sous-sol.org
1636L: linux-security-module@wirex.com 1635L: linux-security-module@vger.kernel.org
1637W: http://lsm.immunix.org 1636W: http://lsm.immunix.org
1638T: git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git 1637T: git kernel.org:/pub/scm/linux/kernel/git/chrisw/lsm-2.6.git
1639S: Supported 1638S: Supported
@@ -1753,7 +1752,8 @@ P: Ralf Baechle
1753M: ralf@linux-mips.org 1752M: ralf@linux-mips.org
1754W: http://www.linux-mips.org/ 1753W: http://www.linux-mips.org/
1755L: linux-mips@linux-mips.org 1754L: linux-mips@linux-mips.org
1756S: Maintained 1755T: git www.linux-mips.org:/pub/scm/linux.git
1756S: Supported
1757 1757
1758MISCELLANEOUS MCA-SUPPORT 1758MISCELLANEOUS MCA-SUPPORT
1759P: James Bottomley 1759P: James Bottomley