Merge tag 'for-3.6' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci

[~andy/linux] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3086d4b12711399d6aa3397be62d1853efbf9fe4..cd8a3f61a79c9649fcbb05f4c4dca831cc29d3a9 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -329,7 +329,7 @@ F:  drivers/hwmon/adm1029.c
 
 ADM8211 WIRELESS DRIVER
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/
+W:     http://wireless.kernel.org/
 S:     Orphan
 F:     drivers/net/wireless/adm8211.*
 
@@ -1441,7 +1441,7 @@ B43 WIRELESS DRIVER
 M:     Stefano Brivio <stefano.brivio@polimi.it>
 L:     linux-wireless@vger.kernel.org
 L:     b43-dev@lists.infradead.org
-W:     http://linuxwireless.org/en/users/Drivers/b43
+W:     http://wireless.kernel.org/en/users/Drivers/b43
 S:     Maintained
 F:     drivers/net/wireless/b43/
 
@@ -1450,7 +1450,7 @@ M:        Larry Finger <Larry.Finger@lwfinger.net>
 M:     Stefano Brivio <stefano.brivio@polimi.it>
 L:     linux-wireless@vger.kernel.org
 L:     b43-dev@lists.infradead.org
-W:     http://linuxwireless.org/en/users/Drivers/b43
+W:     http://wireless.kernel.org/en/users/Drivers/b43
 S:     Maintained
 F:     drivers/net/wireless/b43legacy/
 
@@ -1613,6 +1613,7 @@ M:        Arend van Spriel <arend@broadcom.com>
 M:     Franky (Zhenhui) Lin <frankyl@broadcom.com>
 M:     Kan Yan <kanyan@broadcom.com>
 L:     linux-wireless@vger.kernel.org
+L:     brcm80211-dev-list@broadcom.com
 S:     Supported
 F:     drivers/net/wireless/brcm80211/
 
@@ -3679,14 +3680,6 @@ T:       git git://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi.git
 S:     Supported
 F:     drivers/net/wireless/iwlwifi/
 
-INTEL WIRELESS MULTICOMM 3200 WIFI (iwmc3200wifi)
-M:     Samuel Ortiz <samuel.ortiz@intel.com>
-M:     Intel Linux Wireless <ilw@linux.intel.com>
-L:     linux-wireless@vger.kernel.org
-S:     Supported
-W:     http://wireless.kernel.org/en/users/Drivers/iwmc3200wifi
-F:     drivers/net/wireless/iwmc3200wifi/
-
 INTEL MANAGEMENT ENGINE (mei)
 M:     Tomas Winkler <tomas.winkler@intel.com>
 L:     linux-kernel@vger.kernel.org
@@ -4009,8 +4002,8 @@ F:        arch/ia64/include/asm/kvm*
 F:     arch/ia64/kvm/
 
 KERNEL VIRTUAL MACHINE for s390 (KVM/s390)
-M:     Carsten Otte <cotte@de.ibm.com>
 M:     Christian Borntraeger <borntraeger@de.ibm.com>
+M:     Cornelia Huck <cornelia.huck@de.ibm.com>
 M:     linux390@de.ibm.com
 L:     linux-s390@vger.kernel.org
 W:     http://www.ibm.com/developerworks/linux/linux390/
@@ -4370,7 +4363,7 @@ F:        arch/m68k/hp300/
 MAC80211
 M:     Johannes Berg <johannes@sipsolutions.net>
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/
+W:     http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 S:     Maintained
@@ -4382,7 +4375,7 @@ MAC80211 PID RATE CONTROL
 M:     Stefano Brivio <stefano.brivio@polimi.it>
 M:     Mattias Nissler <mattias.nissler@gmx.de>
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID
+W:     http://wireless.kernel.org/en/developers/Documentation/mac80211/RateControl/PID
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211.git
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jberg/mac80211-next.git
 S:     Maintained
@@ -4611,7 +4604,6 @@ S:        Maintained
 F:     drivers/usb/musb/
 
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
-M:     Jon Mason <mason@myri.com>
 M:     Andrew Gallatin <gallatin@myri.com>
 L:     netdev@vger.kernel.org
 W:     http://www.myri.com/scs/download-Myri10GE.html
@@ -4656,8 +4648,6 @@ F:        net/sched/sch_netem.c
 NETERION 10GbE DRIVERS (s2io/vxge)
 M:     Jon Mason <jdmason@kudzu.us>
 L:     netdev@vger.kernel.org
-W:     http://trac.neterion.com/cgi-bin/trac.cgi/wiki/Linux?Anonymous
-W:     http://trac.neterion.com/cgi-bin/trac.cgi/wiki/X3100Linux?Anonymous
 S:     Supported
 F:     Documentation/networking/s2io.txt
 F:     Documentation/networking/vxge.txt
@@ -5068,7 +5058,7 @@ F:        fs/ocfs2/
 
 ORINOCO DRIVER
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/en/users/Drivers/orinoco
+W:     http://wireless.kernel.org/en/users/Drivers/orinoco
 W:     http://www.nongnu.org/orinoco/
 S:     Orphan
 F:     drivers/net/wireless/orinoco/
@@ -5220,7 +5210,7 @@ PCI SUBSYSTEM
 M:     Bjorn Helgaas <bhelgaas@google.com>
 L:     linux-pci@vger.kernel.org
 Q:     http://patchwork.ozlabs.org/project/linux-pci/list/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/linux.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git
 S:     Supported
 F:     Documentation/PCI/
 F:     drivers/pci/
@@ -5772,7 +5762,7 @@ F:        net/rose/
 RTL8180 WIRELESS DRIVER
 M:     "John W. Linville" <linville@tuxdriver.com>
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/
+W:     http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
 F:     drivers/net/wireless/rtl818x/rtl8180/
@@ -5782,7 +5772,7 @@ M:        Herton Ronaldo Krzesinski <herton@canonical.com>
 M:     Hin-Tak Leung <htl10@users.sourceforge.net>
 M:     Larry Finger <Larry.Finger@lwfinger.net>
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/
+W:     http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
 F:     drivers/net/wireless/rtl818x/rtl8187/
@@ -5791,7 +5781,7 @@ RTL8192CE WIRELESS DRIVER
 M:     Larry Finger <Larry.Finger@lwfinger.net>
 M:     Chaoming Li <chaoming_li@realsil.com.cn>
 L:     linux-wireless@vger.kernel.org
-W:     http://linuxwireless.org/
+W:     http://wireless.kernel.org/
 T:     git git://git.kernel.org/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:     Maintained
 F:     drivers/net/wireless/rtlwifi/
@@ -6252,9 +6242,9 @@ F:        Documentation/hwmon/smm665
 F:     drivers/hwmon/smm665.c
 
 SMSC EMC2103 HARDWARE MONITOR DRIVER
-M:     Steve Glendinning <steve.glendinning@smsc.com>
+M:     Steve Glendinning <steve.glendinning@shawell.net>
 L:     lm-sensors@lm-sensors.org
-S:     Supported
+S:     Maintained
 F:     Documentation/hwmon/emc2103
 F:     drivers/hwmon/emc2103.c
 
@@ -6273,22 +6263,22 @@ F:      Documentation/hwmon/smsc47b397
 F:     drivers/hwmon/smsc47b397.c
 
 SMSC911x ETHERNET DRIVER
-M:     Steve Glendinning <steve.glendinning@smsc.com>
+M:     Steve Glendinning <steve.glendinning@shawell.net>
 L:     netdev@vger.kernel.org
-S:     Supported
+S:     Maintained
 F:     include/linux/smsc911x.h
 F:     drivers/net/ethernet/smsc/smsc911x.*
 
 SMSC9420 PCI ETHERNET DRIVER
-M:     Steve Glendinning <steve.glendinning@smsc.com>
+M:     Steve Glendinning <steve.glendinning@shawell.net>
 L:     netdev@vger.kernel.org
-S:     Supported
+S:     Maintained
 F:     drivers/net/ethernet/smsc/smsc9420.*
 
 SMSC UFX6000 and UFX7000 USB to VGA DRIVER
-M:     Steve Glendinning <steve.glendinning@smsc.com>
+M:     Steve Glendinning <steve.glendinning@shawell.net>
 L:     linux-fbdev@vger.kernel.org
-S:     Supported
+S:     Maintained
 F:     drivers/video/smscufx.c
 
 SN-IA64 (Itanium) SUB-PLATFORM
@@ -6775,9 +6765,11 @@ F:       include/linux/tifm.h
 
 TI LM49xxx FAMILY ASoC CODEC DRIVERS
 M:     M R Swami Reddy <mr.swami.reddy@ti.com>
+M:     Vishwas A Deshpande <vishwas.a.deshpande@ti.com>
 L:     alsa-devel@alsa-project.org (moderated for non-subscribers)
 S:     Maintained
 F:     sound/soc/codecs/lm49453*
+F:     sound/soc/codecs/isabelle*
 
 TI TWL4030 SERIES SOC CODEC DRIVER
 M:     Peter Ujfalusi <peter.ujfalusi@ti.com>
@@ -6975,6 +6967,13 @@ S:       Maintained
 F:     Documentation/filesystems/ufs.txt
 F:     fs/ufs/
 
+UHID USERSPACE HID IO DRIVER:
+M:     David Herrmann <dh.herrmann@googlemail.com>
+L:     linux-input@vger.kernel.org
+S:     Maintained
+F:     drivers/hid/uhid.c
+F:     include/linux/uhid.h
+
 ULTRA-WIDEBAND (UWB) SUBSYSTEM:
 L:     linux-usb@vger.kernel.org
 S:     Orphan
@@ -7235,9 +7234,9 @@ S:        Supported
 F:     drivers/usb/serial/whiteheat*
 
 USB SMSC95XX ETHERNET DRIVER
-M:     Steve Glendinning <steve.glendinning@smsc.com>
+M:     Steve Glendinning <steve.glendinning@shawell.net>
 L:     netdev@vger.kernel.org
-S:     Supported
+S:     Maintained
 F:     drivers/net/usb/smsc95xx.*
 
 USB SN9C1xx DRIVER