Merge branch 'merge-fixes' into devel

1 files changed, 19 insertions, 19 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index a1d3dc873487..2b67bb057180 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -846,15 +846,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
@@ -2122,7 +2113,7 @@ M:	reinette.chatre@intel.com
 L:      linux-wireless@vger.kernel.org
 L:      ipw3945-devel@lists.sourceforge.net
 W:      http://intellinuxwireless.org
-T:      git git://git.kernel.org/pub/scm/linux/kernel/git/rchatre/iwlwifi-2.6.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-2.6.git
 S:      Supported
 
 IOC3 ETHERNET DRIVER
@@ -2203,7 +2194,7 @@ S:	Maintained
 ISDN SUBSYSTEM
 P:      Karsten Keil
 M:      kkeil@suse.de
-L:      isdn4linux@listserv.isdn4linux.de
+L:      isdn4linux@listserv.isdn4linux.de (subscribers-only)
 W:      http://www.isdn4linux.de
 T:      git kernel.org:/pub/scm/linux/kernel/kkeil/isdn-2.6.git
 S:      Maintained
@@ -2211,7 +2202,7 @@ S:	Maintained
 ISDN SUBSYSTEM (Eicon active card driver)
 P:      Armin Schindler
 M:      mac@melware.de
-L:      isdn4linux@listserv.isdn4linux.de
+L:      isdn4linux@listserv.isdn4linux.de (subscribers-only)
 W:      http://www.melware.de
 S:      Maintained
 
@@ -2325,6 +2316,12 @@ L:	linux-kernel@vger.kernel.org
 L:      kexec@lists.infradead.org
 S:      Maintained
 
+KGDB
+P:      Jason Wessel
+M:      jason.wessel@windriver.com
+L:      kgdb-bugreport@lists.sourceforge.net
+S:      Maintained
+
 KPROBES
 P:      Ananth N Mavinakayanahalli
 M:      ananth@in.ibm.com
@@ -2952,6 +2949,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
@@ -3286,6 +3284,7 @@ L:	linux-wireless@vger.kernel.org
 L:      rt2400-devel@lists.sourceforge.net
 W:      http://rt2x00.serialmonkey.com/
 S:      Maintained
+T:      git kernel.org:/pub/scm/linux/kernel/git/ivd/rt2x00.git
 F:      drivers/net/wireless/rt2x00/
 
 RAMDISK RAM BLOCK DEVICE DRIVER
@@ -3348,6 +3347,13 @@ L:	reiserfs-devel@vger.kernel.org
 W:      http://www.namesys.com
 S:      Supported
 
+RFKILL
+P:      Ivo van Doorn
+M:      IvDoorn@gmail.com
+L:      netdev@vger.kernel.org
+S:      Maintained
+F:      net/rfkill
+
 ROCKETPORT DRIVER
 P:      Comtrol Corp.
 W:      http://www.comtrol.com
@@ -3470,7 +3476,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
 
@@ -3604,12 +3610,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