1 files changed, 109 insertions, 37 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 277877a34ef6..af1c7926c153 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -55,7 +55,7 @@ trivial patch so apply some common sense.
 
 8.      Happy hacking.
 
-                -----------------------------------
+                -----------------------------------
 
 Maintainers List (try to look for most precise areas first)
 
@@ -384,7 +384,7 @@ S:	Supported
 
 APPLETALK NETWORK LAYER
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
+M:      acme@ghostprotocols.net
 S:      Maintained
 
 ARC FRAMEBUFFER DRIVER
@@ -656,6 +656,7 @@ S:	Supported
 ATMEL WIRELESS DRIVER
 P:      Simon Kelley
 M:      simon@thekelleys.org.uk
+L:      linux-wireless@vger.kernel.org
 W:      http://www.thekelleys.org.uk/atmel
 W:      http://atmelwlandriver.sourceforge.net/
 S:      Maintained
@@ -711,6 +712,7 @@ P:	Larry Finger
 M:      Larry.Finger@lwfinger.net
 P:      Stefano Brivio
 M:      st3@riseup.net
+L:      linux-wireless@vger.kernel.org
 W:      http://bcm43xx.berlios.de/
 S:      Maintained
 
@@ -871,6 +873,12 @@ W:	http://linuxtv.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/mchehab/v4l-dvb.git
 S:      Maintained
 
+CAFE CMOS INTEGRATED CAMERA CONTROLLER DRIVER
+P:      Jonathan Corbet
+M:      corbet@lwn.net
+L:      video4linux-list@redhat.com
+S:      Maintained
+
 CALGARY x86-64 IOMMU
 P:      Muli Ben-Yehuda
 M:      muli@il.ibm.com
@@ -892,6 +900,12 @@ M:	maxextreme@gmail.com
 L:      linux-kernel@vger.kernel.org
 S:      Maintained
 
+CFG80211 and NL80211
+P:      Johannes Berg
+M:      johannes@sipsolutions.net
+L:      linux-wireless@vger.kernel.org
+S:      Maintained
+
 COMMON INTERNET FILE SYSTEM (CIFS)
 P:      Steve French
 M:      sfrench@samba.org
@@ -899,7 +913,7 @@ L:	linux-cifs-client@lists.samba.org
 L:      samba-technical@lists.samba.org
 W:      http://us1.samba.org/samba/Linux_CIFS_client.html
 T:      git kernel.org:/pub/scm/linux/kernel/git/sfrench/cifs-2.6.git
-S:      Supported       
+S:      Supported
 
 CONFIGFS
 P:      Joel Becker
@@ -967,6 +981,11 @@ M:	mhw@wittsend.com
 W:      http://www.wittsend.com/computone.html
 S:      Maintained
 
+CONEXANT ACCESSRUNNER USB DRIVER
+P:      Simon Arlott
+M:      cxacru@fire.lp0.eu
+S:      Maintained
+
 COSA/SRP SYNC SERIAL DRIVER
 P:      Jan "Yenya" Kasprzak
 M:      kas@fi.muni.cz
@@ -1034,9 +1053,8 @@ S:	Maintained
 
 CYCLADES 2X SYNC CARD DRIVER
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
-W:      http://advogato.org/person/acme
-L:      cycsyn-devel@bazar.conectiva.com.br
+M:      acme@ghostprotocols.net
+W:      http://oops.ghostprotocols.net:81/blog
 S:      Maintained
 
 CYCLADES ASYNC MUX DRIVER
@@ -1077,7 +1095,7 @@ S:	Maintained
 
 DCCP PROTOCOL
 P:      Arnaldo Carvalho de Melo
-M:      acme@mandriva.com
+M:      acme@ghostprotocols.net
 L:      dccp@vger.kernel.org
 W:      http://linux-net.osdl.org/index.php/DCCP
 S:      Maintained
@@ -1376,6 +1394,13 @@ L:	linuxppc-embedded@ozlabs.org
 L:      netdev@vger.kernel.org
 S:      Maintained
 
+FREESCALE HIGHSPEED USB DEVICE DRIVER
+P:      Li Yang
+M:      leoli@freescale.com
+L:      linux-usb-devel@lists.sourceforge.net
+L:      linuxppc-embedded@ozlabs.org
+S:      Maintained
+
 FILE LOCKING (flock() and fcntl()/lockf())
 P:      Matthew Wilcox
 M:      matthew@wil.cx
@@ -1542,23 +1567,24 @@ P:	Chirag Kantharia
 M:      chirag.kantharia@hp.com
 L:      iss_storagedev@hp.com
 S:      Maintained
- 
+
 HEWLETT-PACKARD SMART2 RAID DRIVER
 P:      Chirag Kantharia
 M:      chirag.kantharia@hp.com
 L:      iss_storagedev@hp.com
 S:      Maintained
- 
+
 HEWLETT-PACKARD SMART CISS RAID DRIVER (cciss)
 P:      Mike Miller
 M:      mike.miller@hp.com
 L:      iss_storagedev@hp.com
 S:      Supported
- 
+
 HOST AP DRIVER
 P:      Jouni Malinen
-M:      jkmaline@cc.hut.fi
-L:      hostap@shmoo.com
+M:      j@w1.fi
+L:      hostap@shmoo.com (subscribers-only)
+L:      linux-wireless@vger.kernel.org
 W:      http://hostap.epitest.fi/
 S:      Maintained
 
@@ -1632,15 +1658,6 @@ W:	http://www.ia64-linux.org/
 T:      git kernel.org:/pub/scm/linux/kernel/git/aegl/linux-2.6.git
 S:      Maintained
 
-IBM ACPI EXTRAS DRIVER
-P:      Henrique de Moraes Holschuh
-M:      ibm-acpi@hmh.eng.br
-L:      ibm-acpi-devel@lists.sourceforge.net
-W:      http://ibm-acpi.sourceforge.net
-W:      http://thinkwiki.org/wiki/Ibm-acpi
-T:      git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
-S:      Maintained
-
 SN-IA64 (Itanium) SUB-PLATFORM
 P:      Jes Sorensen
 M:      jes@sgi.com
@@ -1665,7 +1682,7 @@ P:	Jack Hammer
 P:      Dave Jeffery
 M:      ipslinux@adaptec.com
 W:      http://www.developer.ibm.com/welcome/netfinity/serveraid.html
-S:      Supported 
+S:      Supported
 
 IDE SUBSYSTEM
 P:      Bartlomiej Zolnierkiewicz
@@ -1794,6 +1811,7 @@ P:	Jeff Kirsher
 M:      jeffrey.t.kirsher@intel.com
 P:      Auke Kok
 M:      auke-jan.h.kok@intel.com
+L:      e1000-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
 
@@ -1808,6 +1826,7 @@ P:	Jeff Kirsher
 M:      jeffrey.t.kirsher@intel.com
 P:      Auke Kok
 M:      auke-jan.h.kok@intel.com
+L:      e1000-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
 
@@ -1822,6 +1841,7 @@ P:	Jesse Brandeburg
 M:      jesse.brandeburg@intel.com
 P:      Auke Kok
 M:      auke-jan.h.kok@intel.com
+L:      e1000-devel@lists.sourceforge.net
 W:      http://sourceforge.net/projects/e1000/
 S:      Supported
 
@@ -1830,6 +1850,7 @@ P:	Yi Zhu
 M:      yi.zhu@intel.com
 P:      James Ketrenos
 M:      jketreno@linux.intel.com
+L:      linux-wireless@vger.kernel.org
 L:      ipw2100-devel@lists.sourceforge.net
 L:      http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:      http://ipw2100.sourceforge.net
@@ -1840,6 +1861,7 @@ P:	Yi Zhu
 M:      yi.zhu@intel.com
 P:      James Ketrenos
 M:      jketreno@linux.intel.com
+L:      linux-wireless@vger.kernel.org
 L:      ipw2100-devel@lists.sourceforge.net
 L:      http://lists.sourceforge.net/mailman/listinfo/ipw2100-devel
 W:      http://ipw2200.sourceforge.net
@@ -1871,7 +1893,7 @@ S:	Supported
 
 IPX NETWORK LAYER
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
+M:      acme@ghostprotocols.net
 L:      netdev@vger.kernel.org
 S:      Maintained
 
@@ -1965,7 +1987,7 @@ M:	kai@germaschewski.name
 P:      Sam Ravnborg
 M:      sam@ravnborg.org
 T:      git kernel.org:/pub/scm/linux/kernel/git/sam/kbuild.git
-S:      Maintained 
+S:      Maintained
 
 KERNEL JANITORS
 P:      Several
@@ -2108,7 +2130,7 @@ S:	Supported
 
 LLC (802.2)
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
+M:      acme@ghostprotocols.net
 S:      Maintained
 
 LINUX FOR 64BIT POWERPC
@@ -2145,7 +2167,7 @@ S:	Maintained
 LOGICAL DISK MANAGER SUPPORT (LDM, Windows 2000/XP Dynamic Disks)
 P:      Richard Russon (FlatCap)
 M:      ldm@flatcap.org
-L:      ldm-devel@lists.sourceforge.net 
+L:      ldm-devel@lists.sourceforge.net
 W:      http://ldm.sourceforge.net
 S:      Maintained
 
@@ -2236,6 +2258,14 @@ L:	linux-mtd@lists.infradead.org
 T:      git git://git.infradead.org/mtd-2.6.git
 S:      Maintained
 
+UNSORTED BLOCK IMAGES (UBI)
+P:      Artem Bityutskiy
+M:      dedekind@infradead.org
+W:      http://www.linux-mtd.infradead.org/
+L:      linux-mtd@lists.infradead.org
+T:      git git://git.infradead.org/ubi-2.6.git
+S:      Maintained
+
 MICROTEK X6 SCANNER
 P:      Oliver Neukum
 M:      oliver@neukum.name
@@ -2473,6 +2503,19 @@ M:	adaplas@gmail.com
 L:      linux-fbdev-devel@lists.sourceforge.net (subscribers-only)
 S:      Maintained
 
+NETERION (S2IO) Xframe 10GbE DRIVER
+P:      Ramkrishna Vepa
+M:      ram.vepa@neterion.com
+P:      Rastapur Santosh
+M:      santosh.rastapur@neterion.com
+P:      Sivakumar Subramani
+M:      sivakumar.subramani@neterion.com
+P:      Sreenivasa Honnur
+M:      sreenivasa.honnur@neterion.com
+L:      netdev@vger.kernel.org
+W:      http://trac.neterion.com/cgi-bin/trac.cgi/wiki/TitleIndex?anonymous
+S:      Supported
+
 OPENCORES I2C BUS DRIVER
 P:      Peter Korsgaard
 M:      jacmet@sunsite.dk
@@ -2486,13 +2529,13 @@ P:	Kurt Hackel
 M:      kurt.hackel@oracle.com
 L:      ocfs2-devel@oss.oracle.com
 W:      http://oss.oracle.com/projects/ocfs2/
-S:      Supported       
+S:      Supported
 
 OLYMPIC NETWORK DRIVER
 P:      Peter De Shrijver
 M:      p2@ace.ulyssis.student.kuleuven.ac.be
 P:      Mike Phillips
-M:      mikep@linuxtr.net 
+M:      mikep@linuxtr.net
 L:      netdev@vger.kernel.org
 L:      linux-tr@linuxtr.net
 W:      http://www.linuxtr.net
@@ -2508,6 +2551,12 @@ P:	Harald Welte
 M:      laforge@gnumonks.org
 S:      Maintained
 
+OMNIVISION OV7670 SENSOR DRIVER
+P:      Jonathan Corbet
+M:      corbet@lwn.net
+L:      video4linux-list@redhat.com
+S:      Maintained
+
 ONSTREAM SCSI TAPE DRIVER
 P:      Willem Riede
 M:      osst@riede.org
@@ -2532,6 +2581,7 @@ P:	Pavel Roskin
 M:      proski@gnu.org
 P:      David Gibson
 M:      hermes@gibson.dropbear.id.au
+L:      linux-wireless@vger.kernel.org
 L:      orinoco-users@lists.sourceforge.net
 L:      orinoco-devel@lists.sourceforge.net
 W:      http://www.nongnu.org/orinoco/
@@ -2711,7 +2761,7 @@ S:	Supported
 PRISM54 WIRELESS DRIVER
 P:      Prism54 Development Team
 M:      developers@islsm.org
-L:      netdev@vger.kernel.org
+L:      linux-wireless@vger.kernel.org
 W:      http://prism54.org
 S:      Maintained
 
@@ -2782,7 +2832,7 @@ S:	Maintained
 RAYLINK/WEBGEAR 802.11 WIRELESS LAN DRIVER
 P:      Corey Thomas
 M:      corey@world.std.com
-L:      linux-kernel@vger.kernel.org
+L:      linux-wireless@vger.kernel.org
 S:      Maintained
 
 RANDOM NUMBER DRIVER
@@ -2961,8 +3011,10 @@ P:	Stephen Smalley
 M:      sds@tycho.nsa.gov
 P:      James Morris
 M:      jmorris@namei.org
+P:      Eric Paris
+M:      eparis@parisplace.org
 L:      linux-kernel@vger.kernel.org (kernel issues)
-L:      selinux@tycho.nsa.gov (general discussion)
+L:      selinux@tycho.nsa.gov (subscribers-only, general discussion)
 W:      http://www.nsa.gov/selinux
 S:      Supported
 
@@ -3024,7 +3076,7 @@ SIS FRAMEBUFFER DRIVER
 P:      Thomas Winischhofer
 M:      thomas@winischhofer.net
 W:      http://www.winischhofer.net/linuxsisvga.shtml
-S:      Maintained      
+S:      Maintained
 
 SIS USB2VGA DRIVER
 P:      Thomas Winischhofer
@@ -3045,7 +3097,7 @@ M:	josejx@gentoo.org
 P:      Daniel Drake
 M:      dsd@gentoo.org
 W:      http://softmac.sipsolutions.net/
-L:      netdev@vger.kernel.org
+L:      linux-wireless@vger.kernel.org
 S:      Maintained
 
 SOFTWARE RAID (Multiple Disks) SUPPORT
@@ -3121,6 +3173,15 @@ P:	Chris Zankel
 M:      chris@zankel.net
 S:      Maintained
 
+THINKPAD ACPI EXTRAS DRIVER
+P:      Henrique de Moraes Holschuh
+M:      ibm-acpi@hmh.eng.br
+L:      ibm-acpi-devel@lists.sourceforge.net
+W:      http://ibm-acpi.sourceforge.net
+W:      http://thinkwiki.org/wiki/Ibm-acpi
+T:      git repo.or.cz/linux-2.6/linux-acpi-2.6/ibm-acpi-2.6.git
+S:      Maintained
+
 UltraSPARC (sparc64):
 P:      David S. Miller
 M:      davem@davemloft.net
@@ -3573,7 +3634,7 @@ L:	linux-usb-devel@lists.sourceforge.net
 W:      http://www.connecttech.com
 S:      Supported
 
-USB SN9C10x DRIVER
+USB SN9C1xx DRIVER
 P:      Luca Risolia
 M:      luca.risolia@studio.unibo.it
 L:      linux-usb-devel@lists.sourceforge.net
@@ -3628,6 +3689,14 @@ L:	linux-usb-devel@lists.sourceforge.net
 W:      http://linux-lc100020.sourceforge.net
 S:      Maintained
 
+USB ZR364XX DRIVER
+P:      Antoine Jacquet
+M:      royale@zerezo.com
+L:      linux-usb-devel@lists.sourceforge.net
+L:      video4linux-list@redhat.com
+W:      http://royale.zerezo.com/zr364xx/
+S:      Maintained
+
 USER-MODE LINUX
 P:      Jeff Dike
 M:      jdike@karaya.com
@@ -3635,7 +3704,7 @@ L:	user-mode-linux-devel@lists.sourceforge.net
 L:      user-mode-linux-user@lists.sourceforge.net
 W:      http://user-mode-linux.sourceforge.net
 S:      Maintained
-        
+
 FAT/VFAT/MSDOS FILESYSTEM:
 P:      OGAWA Hirofumi
 M:      hirofumi@mail.parknet.co.jp
@@ -3750,6 +3819,7 @@ S:	Maintained
 WAVELAN NETWORK DRIVER & WIRELESS EXTENSIONS
 P:      Jean Tourrilhes
 M:      jt@hpl.hp.com
+L:      linux-wireless@vger.kernel.org
 W:      http://www.hpl.hp.com/personal/Jean_Tourrilhes/Linux/
 S:      Maintained
 
@@ -3766,8 +3836,9 @@ S:	Maintained
 
 WL3501 WIRELESS PCMCIA CARD DRIVER
 P:      Arnaldo Carvalho de Melo
-M:      acme@conectiva.com.br
-W:      http://advogato.org/person/acme
+M:      acme@ghostprotocols.net
+L:      linux-wireless@vger.kernel.org
+W:      http://oops.ghostprotocols.net:81/blog
 S:      Maintained
 
 X.25 NETWORK LAYER
@@ -3830,6 +3901,7 @@ M:	dsd@gentoo.org
 P:      Ulrich Kunitz
 M:      kune@deine-taler.de
 W:      http://zd1211.ath.cx/wiki/DriverRewrite
+L:      linux-wireless@vger.kernel.org
 L:      zd1211-devs@lists.sourceforge.net (subscribers-only)
 S:      Maintained