mac80211: support adding/removing keys via cfg80211

[linux-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 3d567fd2e0a192476991839c8f3b7f5efd0197c8..2c848b46dbac75eb8025b7495d80988ee1bb81f4 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -665,12 +665,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 +758,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 +809,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
@@ -978,6 +982,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
@@ -1870,8 +1883,10 @@ T:       quilt kernel.org/pub/linux/kernel/people/bart/pata-2.6/
 S:     Maintained
 
 IDE/ATAPI CDROM DRIVER
+P:     Borislav Petkov
+M:     bbpetkov@yahoo.de
 L:     linux-ide@vger.kernel.org
-S:     Unmaintained
+S:     Maintained
 
 IDE/ATAPI FLOPPY DRIVERS
 P:     Paul Bristow
@@ -1917,7 +1932,7 @@ INFINIBAND SUBSYSTEM
 P:     Roland Dreier
 M:     rolandd@cisco.com
 P:     Sean Hefty
-M:     mshefty@ichips.intel.com
+M:     sean.hefty@intel.com
 P:     Hal Rosenstock
 M:     hal.rosenstock@gmail.com 
 L:     general@lists.openfabrics.org
@@ -1982,29 +1997,27 @@ L:      netdev@vger.kernel.org
 S:     Maintained
 
 INTEL PRO/100 ETHERNET SUPPORT
-P:     John Ronciak
-M:     john.ronciak@intel.com
+P:     Auke Kok
+M:     auke-jan.h.kok@intel.com
 P:     Jesse Brandeburg
 M:     jesse.brandeburg@intel.com
 P:     Jeff Kirsher
 M:     jeffrey.t.kirsher@intel.com
-P:     Auke Kok
-M:     auke-jan.h.kok@intel.com
+P:     John Ronciak
+M:     john.ronciak@intel.com
 L:     e1000-devel@lists.sourceforge.net
 W:     http://sourceforge.net/projects/e1000/
 S:     Supported
 
 INTEL PRO/1000 GIGABIT ETHERNET SUPPORT
-P:     Jeb Cramer
-M:     cramerj@intel.com
-P:     John Ronciak
-M:     john.ronciak@intel.com
+P:     Auke Kok
+M:     auke-jan.h.kok@intel.com
 P:     Jesse Brandeburg
 M:     jesse.brandeburg@intel.com
 P:     Jeff Kirsher
 M:     jeffrey.t.kirsher@intel.com
-P:     Auke Kok
-M:     auke-jan.h.kok@intel.com
+P:     John Ronciak
+M:     john.ronciak@intel.com
 L:     e1000-devel@lists.sourceforge.net
 W:     http://sourceforge.net/projects/e1000/
 S:     Supported
@@ -2135,6 +2148,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
@@ -2739,8 +2761,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
@@ -3254,8 +3276,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/
@@ -3611,8 +3635,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