summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorLen Brown2007-03-20 16:05:41 +0100
committerLen Brown2007-03-20 16:05:41 +0100
commit54b8c39fbd76a7341b66e49de677ea366737fce7 (patch)
tree2a355e5daa966548034fe30f71fb9d9cc70403cf /MAINTAINERS
parentMerge master.kernel.org:/pub/scm/linux/kernel/git/davem/sparc-2.6 (diff)
parentACPI: IA64: fix %ll build warnings (diff)
downloadkernel-qcow2-linux-54b8c39fbd76a7341b66e49de677ea366737fce7.tar.gz
kernel-qcow2-linux-54b8c39fbd76a7341b66e49de677ea366737fce7.tar.xz
kernel-qcow2-linux-54b8c39fbd76a7341b66e49de677ea366737fce7.zip
Pull misc-for-upstream into release branch
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS5
1 files changed, 2 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 6d8d5b917d1f..dd6978b1e8fb 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3066,11 +3066,10 @@ L: netdev@vger.kernel.org
S: Maintained
SONY VAIO CONTROL DEVICE DRIVER
-P: Stelian Pop
-M: stelian@popies.net
P: Mattia Dongili
M: malattia@linux.it
-W: http://popies.net/sonypi/
+L: linux-acpi@vger.kernel.org
+W: http://www.linux.it/~malattia/wiki/index.php/Sony_drivers
S: Maintained
SOUND