can: Update MAINTAINERS and CREDITS file

[safe/jmp/linux-2.6] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 576702f..b5160a2 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -888,6 +888,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
@@ -1272,6 +1278,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
@@ -3673,6 +3686,14 @@ F:       drivers/mtd/
 F:     include/linux/mtd/
 F:     include/mtd/
 
+MICROBLAZE ARCHITECTURE
+P:     Michal Simek
+M:     monstr@monstr.eu
+L:     microblaze-uclinux@itee.uq.edu.au
+W:     http://www.monstr.eu/fdt/
+T:     git git://git.monstr.eu/linux-2.6-microblaze.git
+S:     Supported
+
 MICROTEK X6 SCANNER
 P:     Oliver Neukum
 M:     oliver@neukum.name
@@ -3908,19 +3929,12 @@ F:      Documentation/blockdev/nbd.txt
 F:     drivers/block/nbd.c
 F:     include/linux/nbd.h
 
-NETWORK DEVICE DRIVERS
-P:     Jeff Garzik
-M:     jgarzik@pobox.com
-L:     netdev@vger.kernel.org
-T:     git git://git.kernel.org/pub/scm/linux/kernel/git/jgarzik/netdev-2.6.git
-S:     Maintained
-F:     drivers/net/
-
 NETWORKING [GENERAL]
-P:     Networking Team
-M:     netdev@vger.kernel.org
+P:     David S. Miller
+M:     davem@davemloft.net
 L:     netdev@vger.kernel.org
-W:     http://linux-net.osdl.org/
+W:     http://www.linuxfoundation.org/en/Net
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
 S:     Maintained
 F:     net/
 F:     include/net/
@@ -3961,6 +3975,13 @@ F:       net/wireless/
 F:     include/net/ieee80211*
 F:     include/net/wireless.h
 
+NETWORKING DRIVERS
+L:     netdev@vger.kernel.org
+W:     http://www.linuxfoundation.org/en/Net
+T:     git git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.git
+S:     Odd Fixes
+F:     drivers/net/
+
 NETXEN (1/10) GbE SUPPORT
 P:     Dhananjay Phadke
 M:     dhananjay@netxen.com
@@ -4177,7 +4198,6 @@ W:        ftp://ftp.redhat.com/pub/redhat/gnupro/AM33/
 S:     Maintained
 F:     Documentation/mn10300/
 F:     arch/mn10300/
-F:     include/asm-mn10300/
 
 PARALLEL PORT SUPPORT
 L:     linux-parport@lists.infradead.org (subscribers-only)
@@ -4414,8 +4434,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
@@ -4600,7 +4620,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/