netfilter: conntrack: move helper destruction to nf_ct_helper_destroy()

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index c547f4a2bb629cd2e584b26743e1714dab92b8b3..a6df68fad9ba0c039b35e877e663ceb7b56ec23f 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -937,6 +937,12 @@ P: Luis R. Rodriguez
 M:     lrodriguez@atheros.com
 P:     Jouni Malinen
 M:     jmalinen@atheros.com
+P:     Sujith Manoharan
+M:     Sujith.Manoharan@atheros.com
+P:     Vasanthakumar Thiagarajan
+M:     vasanth@atheros.com
+P:     Senthil Balasubramanian
+M:     senthilkumar@atheros.com
 L:     linux-wireless@vger.kernel.org
 L:     ath9k-devel@lists.ath9k.org
 S:     Supported
@@ -1329,6 +1335,13 @@ F:       drivers/net/can/
 F:     include/linux/can/
 F:     include/linux/can.h
 
+CAN NETWORK DRIVERS
+P:     Wolfgang Grandegger
+M:     wg@grandegger.com
+L:     socketcan-core@lists.berlios.de (subscribers-only)
+W:     http://developer.berlios.de/projects/socketcan/
+S:     Maintained
+
 CELL BROADBAND ENGINE ARCHITECTURE
 P:     Arnd Bergmann
 M:     arnd@arndb.de
@@ -1532,6 +1545,13 @@ W:       http://www.fi.muni.cz/~kas/cosa/
 S:     Maintained
 F:     drivers/net/wan/cosa*
 
+CPMAC ETHERNET DRIVER
+P:     Florian Fainelli
+M:     florian@openwrt.org
+L:     netdev@vger.kernel.org
+S:     Maintained
+F:     drivers/net/cpmac.c
+
 CPU FREQUENCY DRIVERS
 P:     Dave Jones
 M:     davej@redhat.com
@@ -2799,6 +2819,18 @@ L:       linux1394-devel@lists.sourceforge.net
 S:     Maintained
 F:     drivers/ieee1394/raw1394*
 
+IEEE 802.15.4 SUBSYSTEM
+P:     Dmitry Eremin-Solenikov
+M:     dbaryshkov@gmail.com
+P:     Sergey Lapin
+M:     slapin@ossfans.org
+L:     linux-zigbee-devel@lists.sourceforge.net
+W:     http://apps.sourceforge.net/trac/linux-zigbee
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/lumag/lowpan.git
+S:     Maintained
+F:     net/ieee802154/
+F:     drivers/ieee801254/
+
 INTEGRITY MEASUREMENT ARCHITECTURE (IMA)
 P:     Mimi Zohar
 M:     zohar@us.ibm.com
@@ -3434,11 +3466,10 @@ L:      linuxppc-dev@ozlabs.org
 S:     Maintained
 
 LINUX FOR POWERPC EMBEDDED MPC5XXX
-P:     Sylvain Munaut
-M:     tnt@246tNt.com
 P:     Grant Likely
 M:     grant.likely@secretlab.ca
 L:     linuxppc-dev@ozlabs.org
+T:     git git://git.secretlab.ca/git/linux-2.6.git
 S:     Maintained
 
 LINUX FOR POWERPC EMBEDDED PPC4XX
@@ -3456,6 +3487,7 @@ P:        Grant Likely
 M:     grant.likely@secretlab.ca
 W:     http://wiki.secretlab.ca/index.php/Linux_on_Xilinx_Virtex
 L:     linuxppc-dev@ozlabs.org
+T:     git git://git.secretlab.ca/git/linux-2.6.git
 S:     Maintained
 
 LINUX FOR POWERPC EMBEDDED PPC8XX
@@ -4189,7 +4221,7 @@ P:        Joel Becker
 M:     joel.becker@oracle.com
 L:     ocfs2-devel@oss.oracle.com (moderated for non-subscribers)
 W:     http://oss.oracle.com/projects/ocfs2/
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/mfasheh/ocfs2.git
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jlbec/ocfs2.git
 S:     Supported
 F:     Documentation/filesystems/ocfs2.txt
 F:     Documentation/filesystems/dlmfs.txt
@@ -4492,8 +4524,8 @@ S:        Maintained
 F:     drivers/ata/sata_promise.*
 
 PS3 NETWORK SUPPORT
-P:     Masakazu Mokuno
-M:     mokuno@sm.sony.co.jp
+P:     Geoff Levand
+M:     geoffrey.levand@am.sony.com
 L:     netdev@vger.kernel.org
 L:     cbe-oss-dev@ozlabs.org
 S:     Supported
@@ -4521,6 +4553,19 @@ M:       jim@jtan.com
 L:     cbe-oss-dev@ozlabs.org
 S:     Maintained
 
+PTRACE SUPPORT
+P:     Roland McGrath
+M:     roland@redhat.com
+P:     Oleg Nesterov
+M:     oleg@redhat.com
+L:     linux-kernel@vger.kernel.org
+S:     Maintained
+F:     include/asm-generic/syscall.h
+F:     include/linux/ptrace.h
+F:     include/linux/regset.h
+F:     include/linux/tracehook.h
+F:     kernel/ptrace.c
+
 PVRUSB2 VIDEO4LINUX DRIVER
 P:     Mike Isely
 M:     isely@pobox.com
@@ -4666,13 +4711,13 @@ F:      kernel/rcutorture.c
 
 RDC R-321X SoC
 P:     Florian Fainelli
-M:     florian.fainelli@telecomint.eu
+M:     florian@openwrt.org
 L:     linux-kernel@vger.kernel.org
 S:     Maintained
 
 RDC R6040 FAST ETHERNET DRIVER
 P:     Florian Fainelli
-M:     florian.fainelli@telecomint.eu
+M:     florian@openwrt.org
 L:     netdev@vger.kernel.org
 S:     Maintained
 F:     drivers/net/r6040.c
@@ -4680,7 +4725,7 @@ F:        drivers/net/r6040.c
 RDS - RELIABLE DATAGRAM SOCKETS
 P:     Andy Grover
 M:     andy.grover@oracle.com
-L:     rds-devel@oss.oracle.com
+L:     rds-devel@oss.oracle.com (moderated for non-subscribers)
 S:     Supported
 F:     net/rds/
 
@@ -4720,9 +4765,9 @@ S:        Supported
 F:     fs/reiserfs/
 
 RFKILL
-P:     Ivo van Doorn
-M:     IvDoorn@gmail.com
-L:     netdev@vger.kernel.org
+P:     Johannes Berg
+M:     johannes@sipsolutions.net
+L:     linux-wireless@vger.kernel.org
 S:     Maintained
 F      Documentation/rfkill.txt
 F:     net/rfkill/