drm: i915 patches from Tungsten Graphics

[karo-tx-linux.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 090e10b65b093d77cdf199d4e5b218df10ed6bf5..0db72a36e2453e1f47007a6db14ad37ae3004829 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -2359,13 +2359,6 @@ P:       Nicolas Pitre
 M:     nico@cam.org
 S:     Maintained
 
-SNA NETWORK LAYER
-P:     Jay Schulist
-M:     jschlst@samba.org
-L:     linux-sna@turbolinux.com
-W:     http://www.linux-sna.org
-S:     Supported
-
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:     Ingo Molnar
 M:     mingo@redhat.com
@@ -2487,7 +2480,7 @@ P:        Paul Mundt
 M:     lethal@linux-sh.org
 P:     Kazumoto Kojima
 M:     kkojima@rr.iij4u.or.jp
-L:     linux-sh@m17n.org
+L:     linuxsh-dev@lists.sourceforge.net
 W:     http://www.linux-sh.org
 W:     http://www.m17n.org/linux-sh/
 W:     http://www.rr.iij4u.or.jp/~kkojima/linux-sh4.html