1 files changed, 128 insertions, 65 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index b4f611c60cfc..0885aa2b095a 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -84,13 +84,6 @@ S: Status, one of the following:
                         it has been replaced by a better system and you
                         should be using that.
 
-3C359 NETWORK DRIVER
-P:      Mike Phillips
-M:      mikep@linuxtr.net
-L:      netdev@vger.kernel.org
-W:      http://www.linuxtr.net
-S:      Maintained
-
 3C505 NETWORK DRIVER
 P:      Philip Blundell
 M:      philb@gnu.org
@@ -345,13 +338,12 @@ S:	Maintained for 2.4; PCI support for 2.6.
 AMD GEODE CS5536 USB DEVICE CONTROLLER DRIVER
 P:      Thomas Dahlmann
 M:      thomas.dahlmann@amd.com
-L:      info-linux@geode.amd.com
+L:      info-linux@geode.amd.com        (subscribers-only)
 S:      Supported
 
 AMD GEODE PROCESSOR/CHIPSET SUPPORT
 P:      Jordan Crouse
-M:      info-linux@geode.amd.com
-L:      info-linux@geode.amd.com
+L:      info-linux@geode.amd.com        (subscribers-only)
 W:      http://www.amd.com/us-en/ConnectivitySolutions/TechnicalResources/0,,50_2334_2452_11363,00.html
 S:      Supported
 
@@ -646,6 +638,17 @@ M:	ecashin@coraid.com
 W:      http://www.coraid.com/support/linux
 S:      Supported
 
+ATHEROS ATH5K WIRELESS DRIVER
+P:      Jiri Slaby
+M:      jirislaby@gmail.com
+P:      Nick Kossifidis
+M:      mickflemm@gmail.com
+P:      Luis R. Rodriguez
+M:      mcgrof@gmail.com
+L:      linux-wireless@vger.kernel.org
+L:      ath5k-devel@lists.ath5k.org
+S:      Maintained
+
 ATL1 ETHERNET DRIVER
 P:      Jay Cliburn
 M:      jcliburn@gmail.com
@@ -665,12 +668,18 @@ S:	Maintained
 
 ATMEL AT91 MCI DRIVER
 P:      Nicolas Ferre
-M:      nicolas.ferre@rfo.atmel.com
+M:      nicolas.ferre@atmel.com
 L:      linux-arm-kernel@lists.arm.linux.org.uk (subscribers-only)
 W:      http://www.atmel.com/products/AT91/
 W:      http://www.at91.com/
 S:      Maintained
 
+ATMEL LCDFB DRIVER
+P:      Nicolas Ferre
+M:      nicolas.ferre@atmel.com
+L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
+S:      Maintained
+
 ATMEL MACB ETHERNET DRIVER
 P:      Haavard Skinnemoen
 M:      hskinnemoen@atmel.com
@@ -752,22 +761,20 @@ S:	Supported
 
 BLACKFIN RTC DRIVER
 P:      Mike Frysinger
-M:      michael.frysinger@analog.com
 M:      vapier.adi@gmail.com
 L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 W:      http://blackfin.uclinux.org
 S:      Supported
 
 BLACKFIN SERIAL DRIVER
-P:      Aubrey Li
-M:      aubrey.li@analog.com
+P:      Sonic Zhang
+M:      sonic.zhang@analog.com
 L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 W:      http://blackfin.uclinux.org
 S:      Supported
 
 BLACKFIN WATCHDOG DRIVER
 P:      Mike Frysinger
-M:      michael.frysinger@analog.com
 M:      vapier.adi@gmail.com
 L:      uclinux-dist-devel@blackfin.uclinux.org (subscribers-only)
 W:      http://blackfin.uclinux.org
@@ -805,7 +812,7 @@ P:	Stefano Brivio
 M:      stefano.brivio@polimi.it
 L:      linux-wireless@vger.kernel.org
 W:      http://bcm43xx.berlios.de/
-S:      Maintained
+S:      Obsolete
 
 BEFS FILE SYSTEM
 P:      Sergey S. Kostyliov
@@ -833,6 +840,12 @@ L:	linux-kernel@vger.kernel.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/axboe/linux-2.6-block.git
 S:      Maintained
 
+BLOCK2MTD DRIVER
+P:      Joern Engel
+M:      joern@lazybastard.org
+L:      linux-mtd@lists.infradead.org
+S:      Maintained
+
 BLUETOOTH SUBSYSTEM
 P:      Marcel Holtmann
 M:      marcel@holtmann.org
@@ -924,8 +937,6 @@ M:	maxk@qualcomm.com
 S:      Maintained
 
 BONDING DRIVER
-P:      Chad Tindel
-M:      ctindel@users.sourceforge.net
 P:      Jay Vosburgh
 M:      fubar@us.ibm.com
 L:      bonding-devel@lists.sourceforge.net
@@ -978,6 +989,15 @@ M:	corbet@lwn.net
 L:      video4linux-list@redhat.com
 S:      Maintained
 
+CAN NETWORK LAYER
+P:      Urs Thuermann
+M:      urs.thuermann@volkswagen.de
+P:      Oliver Hartkopp
+M:      oliver.hartkopp@volkswagen.de
+L:      socketcan-core@lists.berlios.de
+W:      http://developer.berlios.de/projects/socketcan/
+S:      Maintained
+
 CALGARY x86-64 IOMMU
 P:      Muli Ben-Yehuda
 M:      muli@il.ibm.com
@@ -1571,7 +1591,7 @@ P:	Alexander Viro
 M:      viro@zeniv.linux.org.uk
 S:      Maintained
 
-FIREWIRE SUBSYSTEM
+FIREWIRE SUBSYSTEM (drivers/firewire, <linux/firewire*.h>)
 P:      Kristian Hoegsberg, Stefan Richter
 M:      krh@redhat.com, stefanr@s5r6.in-berlin.de
 L:      linux1394-devel@lists.sourceforge.net
@@ -1893,7 +1913,7 @@ L:	linux-ide@vger.kernel.org
 L:      linux-scsi@vger.kernel.org
 S:      Orphan
 
-IEEE 1394 SUBSYSTEM
+IEEE 1394 SUBSYSTEM (drivers/ieee1394)
 P:      Ben Collins
 M:      ben.collins@ubuntu.com
 P:      Stefan Richter
@@ -2023,10 +2043,12 @@ W:	http://sourceforge.net/projects/e1000/
 S:      Supported
 
 INTEL PRO/WIRELESS 2100 NETWORK CONNECTION SUPPORT
-P:      Yi Zhu
+P:      Zhu Yi
 M:      yi.zhu@intel.com
 P:      James Ketrenos
 M:      jketreno@linux.intel.com
+P:      Reinette Chatre
+M:      reinette.chatre@intel.com
 L:      linux-wireless@vger.kernel.org
 L:      ipw2100-devel@lists.sourceforge.net
 W:      http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
@@ -2034,10 +2056,12 @@ W:	http://ipw2100.sourceforge.net
 S:      Supported
 
 INTEL PRO/WIRELESS 2915ABG NETWORK CONNECTION SUPPORT
-P:      Yi Zhu
+P:      Zhu Yi
 M:      yi.zhu@intel.com
 P:      James Ketrenos
 M:      jketreno@linux.intel.com
+P:      Reinette Chatre
+M:      reinette.chatre@intel.com
 L:      linux-wireless@vger.kernel.org
 L:      ipw2100-devel@lists.sourceforge.net
 W:      http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
@@ -2047,6 +2071,8 @@ S:	Supported
 INTEL WIRELESS WIFI LINK (iwlwifi)
 P:      Zhu Yi
 M:      yi.zhu@intel.com
+P:      Reinette Chatre
+M:      reinette.chatre@intel.com
 L:      linux-wireless@vger.kernel.org
 L:      ipw3945-devel@lists.sourceforge.net
 W:      http://intellinuxwireless.org
@@ -2135,6 +2161,15 @@ L:	isdn4linux@listserv.isdn4linux.de
 W:      http://www.melware.de
 S:      Maintained
 
+IVTV VIDEO4LINUX DRIVER
+P:      Hans Verkuil
+M:      hverkuil@xs4all.nl
+L:      ivtv-devel@ivtvdriver.org
+L:      ivtv-users@ivtvdriver.org
+L:      video4linux-list@redhat.com
+W:      http://www.ivtvdriver.org
+S:      Maintained
+
 JOURNALLING FLASH FILE SYSTEM V2 (JFFS2)
 P:      David Woodhouse
 M:      dwmw2@infradead.org
@@ -2208,7 +2243,7 @@ P:	J. Bruce Fields
 M:      bfields@fieldses.org
 P:      Neil Brown
 M:      neilb@suse.de
-L:      nfs@lists.sourceforge.net
+L:      linux-nfs@vger.kernel.org
 W:      http://nfs.sourceforge.net/
 S:      Supported
 
@@ -2219,6 +2254,15 @@ L:	kvm-devel@lists.sourceforge.net
 W:      kvm.sourceforge.net
 S:      Supported
 
+KERNEL VIRTUAL MACHINE For Itanium(KVM/IA64)
+P:      Anthony Xu
+M:      anthony.xu@intel.com
+P:      Xiantao Zhang
+M:      xiantao.zhang@intel.com
+L:      kvm-ia64-devel@lists.sourceforge.net
+W:      kvm.sourceforge.net
+S:      Supported
+
 KEXEC
 P:      Eric Biederman
 M:      ebiederm@xmission.com
@@ -2469,6 +2513,16 @@ W:	http://linuxwireless.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:      Maintained
 
+MAC80211 PID RATE CONTROL
+P:      Stefano Brivio
+M:      stefano.brivio@polimi.it
+P:      Mattias Nissler
+M:      mattias.nissler@gmx.de
+L:      linux-wireless@vger.kernel.org
+W:      http://linuxwireless.org/en/developers/Documentation/mac80211/RateControl/PID
+T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
+S:      Maintained
+
 MACVLAN DRIVER
 P:      Patrick McHardy
 M:      kaber@trash.net
@@ -2641,6 +2695,16 @@ M:	James.Bottomley@HansenPartnership.com
 L:      linux-scsi@vger.kernel.org
 S:      Maintained
 
+NETEFFECT IWARP RNIC DRIVER (IW_NES)
+P:      Faisal Latif
+M:      flatif@neteffect.com
+P:      Glenn Streiff
+M:      gstreiff@neteffect.com
+L:      general@lists.openfabrics.org
+W:      http://www.neteffect.com
+S:      Supported
+F:      drivers/infiniband/hw/nes/
+
 NETEM NETWORK EMULATOR
 P:      Stephen Hemminger
 M:      shemminger@linux-foundation.org
@@ -2739,8 +2803,8 @@ T:	git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-2.6.git
 S:      Maintained
 
 NETXEN (1/10) GbE SUPPORT
-P:      Amit S. Kale
-M:      amitkale@netxen.com
+P:      Dhananjay Phadke
+M:      dhananjay@netxen.com
 L:      netdev@vger.kernel.org
 W:      http://www.netxen.com
 S:      Supported
@@ -2815,15 +2879,6 @@ L:	ocfs2-devel@oss.oracle.com
 W:      http://oss.oracle.com/projects/ocfs2/
 S:      Supported
 
-OLYMPIC NETWORK DRIVER
-P:      Peter De Shrijver
-M:      p2@ace.ulyssis.student.kuleuven.ac.be
-P:      Mike Phillips
-M:      mikep@linuxtr.net
-L:      netdev@vger.kernel.org
-W:      http://www.linuxtr.net
-S:      Maintained
-
 OMNIKEY CARDMAN 4000 DRIVER
 P:      Harald Welte
 M:      laforge@gnumonks.org
@@ -2981,8 +3036,8 @@ L:	linux-abi-devel@lists.sourceforge.net
 S:      Maintained
 
 PHRAM MTD DRIVER
-P:      Jörn Engel
-M:      joern@wh.fh-wedel.de
+P:      Joern Engel
+M:      joern@lazybastard.org
 L:      linux-mtd@lists.infradead.org
 S:      Maintained
 
@@ -3004,7 +3059,6 @@ M:	cbou@mail.ru
 P:      David Woodhouse
 M:      dwmw2@infradead.org
 L:      linux-kernel@vger.kernel.org
-L:      kernel-discuss@handhelds.org
 T:      git git.infradead.org/battery-2.6.git
 S:      Maintained
 
@@ -3147,7 +3201,7 @@ S:	Maintained
 
 RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
 P:      Corey Thomas
-M:      corey@world.std.com
+M:      coreythomas@charter.net
 L:      linux-wireless@vger.kernel.org
 S:      Maintained
 
@@ -3170,6 +3224,18 @@ M:	mporter@kernel.crashing.org
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+RDC R-321X SoC
+P:      Florian Fainelli
+M:      florian.fainelli@telecomint.eu
+L:      linux-kernel@vger.kernel.org
+S:      Maintained
+
+RDC R6040 FAST ETHERNET DRIVER
+P:      Florian Fainelli
+M:      florian.fainelli@telecomint.eu
+L:      netdev@vger.kernel.org
+S:      Maintained
+
 READ-COPY UPDATE (RCU)
 P:      Dipankar Sarma
 M:      dipankar@in.ibm.com
@@ -3254,8 +3320,10 @@ W:	http://www.ibm.com/developerworks/linux/linux390/
 S:      Supported
 
 S390 ZFCP DRIVER
-P:      Swen Schillig
-M:      swen@vnet.ibm.com
+P:      Christof Schmitt
+M:      christof.schmitt@de.ibm.com
+P:      Martin Peschke
+M:      mp3@de.ibm.com
 M:      linux390@de.ibm.com
 L:      linux-s390@vger.kernel.org
 W:      http://www.ibm.com/developerworks/linux/linux390/
@@ -3514,6 +3582,9 @@ S:	Maintained
 SOUND - SOC LAYER / DYNAMIC AUDIO POWER MANAGEMENT
 P:      Liam Girdwood
 M:      liam.girdwood@wolfsonmicro.com
+P:      Mark Brown
+M:      broonie@opensource.wolfsonmicro.com
+T:      git opensource.wolfsonmicro.com/linux-2.6-asoc
 L:      alsa-devel@alsa-project.org (subscribers-only)
 S:      Supported
 
@@ -3611,8 +3682,10 @@ L:	linux-kernel@vger.kernel.org ?
 S:      Supported
 
 SPIDERNET NETWORK DRIVER for CELL
-P:      Linas Vepstas
-M:      linas@austin.ibm.com
+P:      Ishizaki Kou
+M:      kou.ishizaki@toshiba.co.jp
+P:      Jens Osterkamp
+M:      jens@de.ibm.com
 L:      netdev@vger.kernel.org
 S:      Supported
 
@@ -3727,13 +3800,6 @@ L:	tlan-devel@lists.sourceforge.net (subscribers-only)
 W:      http://sourceforge.net/projects/tlan/
 S:      Maintained
 
-TOKEN-RING NETWORK DRIVER
-P:      Mike Phillips
-M:      mikep@linuxtr.net
-L:      netdev@vger.kernel.org
-W:      http://www.linuxtr.net
-S:      Maintained
-
 TOSHIBA ACPI EXTRAS DRIVER
 P:      John Belmonte
 M:      toshiba_acpi@memebeam.org
@@ -3754,18 +3820,9 @@ L:	linux-kernel@vger.kernel.org
 S:      Maintained
 
 TRIVIAL PATCHES
-P:      Adrian Bunk
+P:      Jesper Juhl
 M:      trivial@kernel.org
 L:      linux-kernel@vger.kernel.org
-W:      http://www.kernel.org/pub/linux/kernel/people/bunk/trivial/
-T:      git kernel.org:/pub/scm/linux/kernel/git/bunk/trivial.git
-S:      Maintained
-
-TMS380 TOKEN-RING NETWORK DRIVER
-P:      Adam Fritzler
-M:      mid@auk.cx
-L:      linux-tr@linuxtr.net
-W:      http://www.auk.cx/tms380tr/
 S:      Maintained
 
 TULIP NETWORK DRIVER
@@ -3810,6 +3867,12 @@ M:	oliver@neukum.name
 L:      linux-usb@vger.kernel.org
 S:      Maintained
 
+USB AUERSWALD DRIVER
+P:      Wolfgang Muees
+M:      wolfgang@iksw-muees.de
+L:      linux-usb@vger.kernel.org
+S:      Maintained
+
 USB BLOCK DRIVER (UB ub)
 P:      Pete Zaitcev
 M:      zaitcev@redhat.com
@@ -3960,12 +4023,6 @@ S:	Maintained
 W:      http://geocities.com/i0xox0i
 W:      http://firstlight.net/cvs
 
-USB AUERSWALD DRIVER
-P:      Wolfgang Muees
-M:      wolfgang@iksw-muees.de
-L:      linux-usb@vger.kernel.org
-S:      Maintained
-
 USB SERIAL EMPEG EMPEG-CAR MARK I/II DRIVER
 P:      Gary Brubaker
 M:      xavyer@ix.netcom.com
@@ -4023,6 +4080,12 @@ L:	video4linux-list@redhat.com
 W:      http://www.linux-projects.org
 S:      Maintained
 
+USB WIRELESS RNDIS DRIVER (rndis_wlan)
+P:      Jussi Kivilinna
+M:      jussi.kivilinna@mbnet.fi
+L:      linux-wireless@vger.kernel.org
+S:      Maintained
+
 USB ZC0301 DRIVER
 P:      Luca Risolia
 M:      luca.risolia@studio.unibo.it