summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorAnton Altaparmakov2012-02-27 10:01:22 +0100
committerAnton Altaparmakov2012-02-27 10:01:22 +0100
commitf621c5334396fd153cd882ea92466823b7e7b821 (patch)
tree7b829cad44dc0e5003d7cacac3a7a1b128637083 /MAINTAINERS
parentMerge branch 'master' of /Volumes/CaseSensitiveDisk/linux (diff)
parentMerge tag 'stable/for-linus-fixes-3.3-rc5' of git://git.kernel.org/pub/scm/li... (diff)
downloadkernel-qcow2-linux-f621c5334396fd153cd882ea92466823b7e7b821.tar.gz
kernel-qcow2-linux-f621c5334396fd153cd882ea92466823b7e7b821.tar.xz
kernel-qcow2-linux-f621c5334396fd153cd882ea92466823b7e7b821.zip
Merge branch 'master' of /Volumes/CaseSensitiveDisk/linux
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 2 insertions, 5 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 924fb0bb52e0..7fe9bb245bd3 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -269,7 +269,6 @@ S: Orphan
F: drivers/platform/x86/wmi.c
AD1889 ALSA SOUND DRIVER
-M: Kyle McMartin <kyle@mcmartin.ca>
M: Thibaut Varene <T-Bone@parisc-linux.org>
W: http://wiki.parisc-linux.org/AD1889
L: linux-parisc@vger.kernel.org
@@ -3047,7 +3046,6 @@ F: drivers/hwspinlock/hwspinlock_*
F: include/linux/hwspinlock.h
HARMONY SOUND DRIVER
-M: Kyle McMartin <kyle@mcmartin.ca>
L: linux-parisc@vger.kernel.org
S: Maintained
F: sound/parisc/harmony.*
@@ -3782,7 +3780,7 @@ F: Documentation/kdump/
KERNEL AUTOMOUNTER v4 (AUTOFS4)
M: Ian Kent <raven@themaw.net>
-L: autofs@linux.kernel.org
+L: autofs@vger.kernel.org
S: Maintained
F: fs/autofs4/
@@ -5000,9 +4998,8 @@ F: Documentation/blockdev/paride.txt
F: drivers/block/paride/
PARISC ARCHITECTURE
-M: Kyle McMartin <kyle@mcmartin.ca>
-M: Helge Deller <deller@gmx.de>
M: "James E.J. Bottomley" <jejb@parisc-linux.org>
+M: Helge Deller <deller@gmx.de>
L: linux-parisc@vger.kernel.org
W: http://www.parisc-linux.org/
Q: http://patchwork.kernel.org/project/linux-parisc/list/