aboutsummaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS9
1 files changed, 3 insertions, 6 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index ed48d55662c1..3b5fe0c09c23 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -269,7 +269,6 @@ S: Orphan
269F: drivers/platform/x86/wmi.c 269F: drivers/platform/x86/wmi.c
270 270
271AD1889 ALSA SOUND DRIVER 271AD1889 ALSA SOUND DRIVER
272M: Kyle McMartin <kyle@mcmartin.ca>
273M: Thibaut Varene <T-Bone@parisc-linux.org> 272M: Thibaut Varene <T-Bone@parisc-linux.org>
274W: http://wiki.parisc-linux.org/AD1889 273W: http://wiki.parisc-linux.org/AD1889
275L: linux-parisc@vger.kernel.org 274L: linux-parisc@vger.kernel.org
@@ -3049,7 +3048,6 @@ F: drivers/hwspinlock/hwspinlock_*
3049F: include/linux/hwspinlock.h 3048F: include/linux/hwspinlock.h
3050 3049
3051HARMONY SOUND DRIVER 3050HARMONY SOUND DRIVER
3052M: Kyle McMartin <kyle@mcmartin.ca>
3053L: linux-parisc@vger.kernel.org 3051L: linux-parisc@vger.kernel.org
3054S: Maintained 3052S: Maintained
3055F: sound/parisc/harmony.* 3053F: sound/parisc/harmony.*
@@ -5000,9 +4998,8 @@ F: Documentation/blockdev/paride.txt
5000F: drivers/block/paride/ 4998F: drivers/block/paride/
5001 4999
5002PARISC ARCHITECTURE 5000PARISC ARCHITECTURE
5003M: Kyle McMartin <kyle@mcmartin.ca>
5004M: Helge Deller <deller@gmx.de>
5005M: "James E.J. Bottomley" <jejb@parisc-linux.org> 5001M: "James E.J. Bottomley" <jejb@parisc-linux.org>
5002M: Helge Deller <deller@gmx.de>
5006L: linux-parisc@vger.kernel.org 5003L: linux-parisc@vger.kernel.org
5007W: http://www.parisc-linux.org/ 5004W: http://www.parisc-linux.org/
5008Q: http://patchwork.kernel.org/project/linux-parisc/list/ 5005Q: http://patchwork.kernel.org/project/linux-parisc/list/
@@ -5861,7 +5858,7 @@ S: Maintained
5861F: drivers/mmc/host/sdhci-spear.c 5858F: drivers/mmc/host/sdhci-spear.c
5862 5859
5863SECURITY SUBSYSTEM 5860SECURITY SUBSYSTEM
5864M: James Morris <jmorris@namei.org> 5861M: James Morris <james.l.morris@oracle.com>
5865L: linux-security-module@vger.kernel.org (suggested Cc:) 5862L: linux-security-module@vger.kernel.org (suggested Cc:)
5866T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git 5863T: git git://git.kernel.org/pub/scm/linux/kernel/git/jmorris/linux-security.git
5867W: http://security.wiki.kernel.org/ 5864W: http://security.wiki.kernel.org/
@@ -5874,7 +5871,7 @@ S: Supported
5874 5871
5875SELINUX SECURITY MODULE 5872SELINUX SECURITY MODULE
5876M: Stephen Smalley <sds@tycho.nsa.gov> 5873M: Stephen Smalley <sds@tycho.nsa.gov>
5877M: James Morris <jmorris@namei.org> 5874M: James Morris <james.l.morris@oracle.com>
5878M: Eric Paris <eparis@parisplace.org> 5875M: Eric Paris <eparis@parisplace.org>
5879L: selinux@tycho.nsa.gov (subscribers-only, general discussion) 5876L: selinux@tycho.nsa.gov (subscribers-only, general discussion)
5880W: http://selinuxproject.org 5877W: http://selinuxproject.org