1 files changed, 23 insertions, 12 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 8f2b67ea0549..2859e9a4ba3f 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -742,7 +742,7 @@ M:	jirislaby@gmail.com
 P:      Nick Kossifidis
 M:      mickflemm@gmail.com
 P:      Luis R. Rodriguez
-M:      mcgrof@gmail.com
+M:      lrodriguez@atheros.com
 P:      Bob Copeland
 M:      me@bobcopeland.com
 L:      linux-wireless@vger.kernel.org
@@ -1607,11 +1607,6 @@ L:	acpi4asus-user@lists.sourceforge.net
 W:      http://sourceforge.net/projects/acpi4asus
 S:      Maintained
 
-EEPRO100 NETWORK DRIVER
-P:      Andrey V. Savochkin
-M:      saw@saw.sw.com.sg
-S:      Maintained
-
 EFS FILESYSTEM
 W:      http://aeschi.ch.eu.org/efs/
 S:      Orphan
@@ -3614,16 +3609,26 @@ L:	linux-hams@vger.kernel.org
 W:      http://www.linux-ax25.org/
 S:      Maintained
 
-RTL818X WIRELESS DRIVER
-P:      Michael Wu
-M:      flamingice@sourmilk.net
-P:      Andrea Merello
-M:      andreamrl@tiscali.it
+RTL8180 WIRELESS DRIVER
+P:      John W. Linville
+M:      linville@tuxdriver.com
 L:      linux-wireless@vger.kernel.org
 W:      http://linuxwireless.org/
-T:      git kernel.org:/pub/scm/linux/kernel/git/mwu/mac80211-drivers.git
+T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-testing.git
 S:      Maintained
 
+RTL8187 WIRELESS DRIVER
+P:       Herton Ronaldo Krzesinski
+M:      herton@mandriva.com.br
+P:      Hin-Tak Leung
+M       htl10@users.sourceforge.net
+P:      Larry Finger
+M:      Larry.Finger@lwfinger.net
+L:      linux-wireless@vger.kernel.org
+W:      http://linuxwireless.org/
+T:      git kernel.org:/pub/scm/linux/kernel/git/linville/wireless-testing.git
+S:      Maintained
+
 S3 SAVAGE FRAMEBUFFER DRIVER
 P:      Antonino Daplas
 M:      adaplas@gmail.com
@@ -3904,6 +3909,12 @@ M:	mhoffman@lightlink.com
 L:      lm-sensors@lm-sensors.org
 S:      Maintained
 
+SMSC911x ETHERNET DRIVER
+P:      Steve Glendinning
+M:      steve.glendinning@smsc.com
+L:      netdev@vger.kernel.org
+S:      Supported
+
 SMX UIO Interface
 P:      Ben Nizette
 M:      bn@niasdigital.com