Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net-2.6.25

[sfrench/cifs-2.6.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index d0662dc7ea370a08f4f80352cd472b6aa46871a5..ba05e8058689dc0471ddb9fe753290075404774d 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -646,6 +646,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
@@ -3208,6 +3219,12 @@ M:       mporter@kernel.crashing.org
 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