summaryrefslogtreecommitdiffstats
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJesse Barnes <jbarnes@hobbes.lan>2008-06-12 12:06:58 -0700
committerJesse Barnes <jbarnes@virtuousgeek.org>2008-06-12 12:06:58 -0700
commit53eb2fbeb9e68e1a9a23945de8450999c46270ce (patch)
tree3c50f8690f63b53b3cffbcc226cbbe3c8c6de753 /MAINTAINERS
parent8344b568f5bdc7ee1bba909de3294c6348c36056 (diff)
parent0e6859d49ff194e01afc229c996e3aefca1a0539 (diff)
downloadlinux-53eb2fbeb9e68e1a9a23945de8450999c46270ce.tar.gz
linux-53eb2fbeb9e68e1a9a23945de8450999c46270ce.tar.bz2
linux-53eb2fbeb9e68e1a9a23945de8450999c46270ce.zip
Merge branch 'suspend' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux-acpi-2.6 into linux-next
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS7
1 files changed, 0 insertions, 7 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index 89db949bcd80..02a85ab7387d 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -3658,13 +3658,6 @@ M: romieu@fr.zoreil.com
L: netdev@vger.kernel.org
S: Maintained
-SIS 5513 IDE CONTROLLER DRIVER
-P: Lionel Bouton
-M: Lionel.Bouton@inet6.fr
-W: http://inet6.dyn.dhs.org/sponsoring/sis5513/index.html
-W: http://gyver.homeip.net/sis5513/index.html
-S: Maintained
-
SIS 900/7016 FAST ETHERNET DRIVER
P: Daniele Venzano
M: venza@brownhat.org