atm: ambassador: vcc_sf semaphore to mutex

[net-next-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3eceebb48c929db30d5513a010d104d3102b9cfe..68c61420b59d1b1c96eb0d639966a6e8740f55b1 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -840,15 +840,6 @@ L: linux-wireless@vger.kernel.org
 W:     http://linuxwireless.org/en/users/Drivers/b43
 S:     Maintained
 
-BCM43XX WIRELESS DRIVER (SOFTMAC BASED VERSION)
-P:     Larry Finger
-M:     Larry.Finger@lwfinger.net
-P:     Stefano Brivio
-M:     stefano.brivio@polimi.it
-L:     linux-wireless@vger.kernel.org
-W:     http://bcm43xx.berlios.de/
-S:     Obsolete
-
 BEFS FILE SYSTEM
 P:     Sergey S. Kostyliov
 M:     rathamahata@php4.ru
@@ -1035,7 +1026,7 @@ P:        Urs Thuermann
 M:     urs.thuermann@volkswagen.de
 P:     Oliver Hartkopp
 M:     oliver.hartkopp@volkswagen.de
-L:     socketcan-core@lists.berlios.de
+L:     socketcan-core@lists.berlios.de (subscribers-only)
 W:     http://developer.berlios.de/projects/socketcan/
 S:     Maintained
 
@@ -2556,12 +2547,10 @@ W:      http://www.tazenda.demon.co.uk/phil/linux-hp
 S:     Maintained
 
 MAC80211
-P:     Michael Wu
-M:     flamingice@sourmilk.net
 P:     Johannes Berg
 M:     johannes@sipsolutions.net
-P:     Jiri Benc
-M:     jbenc@suse.cz
+P:     Michael Wu
+M:     flamingice@sourmilk.net
 L:     linux-wireless@vger.kernel.org
 W:     http://linuxwireless.org/
 T:     git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
@@ -2952,6 +2941,7 @@ P:        Joel Becker
 M:     joel.becker@oracle.com
 L:     ocfs2-devel@oss.oracle.com
 W:     http://oss.oracle.com/projects/ocfs2/
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
 S:     Supported
 
 OMNIKEY CARDMAN 4000 DRIVER
@@ -3478,7 +3468,7 @@ P:        Vlad Yasevich
 M:     vladislav.yasevich@hp.com
 P:     Sridhar Samudrala
 M:     sri@us.ibm.com
-L:     lksctp-developers@lists.sourceforge.net
+L:     linux-sctp@vger.kernel.org
 W:     http://lksctp.sourceforge.net
 S:     Supported
 
@@ -3532,6 +3522,13 @@ M:       pfg@sgi.com
 L:     linux-ia64@vger.kernel.org
 S:     Supported
 
+SFC NETWORK DRIVER
+P:     Steve Hodgson
+P:     Ben Hutchings
+P:     Robert Stonehouse
+M:     linux-net-drivers@solarflare.com
+S:     Supported
+
 SGI VISUAL WORKSTATION 320 AND 540
 P:     Andrey Panin
 M:     pazke@donpac.ru
@@ -3612,12 +3609,6 @@ M:       mhoffman@lightlink.com
 L:     lm-sensors@lm-sensors.org
 S:     Maintained
 
-SOFTMAC LAYER (IEEE 802.11)
-P:     Daniel Drake
-M:     dsd@gentoo.org
-L:     linux-wireless@vger.kernel.org
-S:     Obsolete
-
 SOFTWARE RAID (Multiple Disks) SUPPORT
 P:     Ingo Molnar
 M:     mingo@redhat.com