1 files changed, 27 insertions, 15 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index fb0da63621cd..8e4e82921070 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -202,13 +202,6 @@ P:	Colin Leroy
 M:      colin@colino.net
 S:      Maintained
 
-ADVANSYS SCSI DRIVER
-P:      Bob Frey
-M:      linux@advansys.com
-W:      http://www.advansys.com/linux.html
-L:      linux-scsi@vger.kernel.org
-S:      Maintained
-
 AEDSP16 DRIVER
 P:      Riccardo Facchetti
 M:      fizban@tin.it
@@ -696,6 +689,11 @@ M:	dz@debian.org
 W:      http://www.debian.org/~dz/i8k/
 S:      Maintained
 
+DELL SYSTEMS MANAGEMENT BASE DRIVER (dcdbas)
+P:      Doug Warzecha
+M:      Douglas_Warzecha@dell.com
+S:      Maintained
+
 DEVICE-MAPPER
 P:      Alasdair Kergon
 L:      dm-devel@redhat.com
@@ -886,7 +884,7 @@ S:	Maintained
 
 FILESYSTEMS (VFS and infrastructure)
 P:      Alexander Viro
-M:      viro@parcelfarce.linux.theplanet.co.uk
+M:      viro@zeniv.linux.org.uk
 S:      Maintained
 
 FIRMWARE LOADER (request_firmware)
@@ -940,6 +938,13 @@ M:	khc@pm.waw.pl
 W:      http://www.kernel.org/pub/linux/utils/net/hdlc/
 S:      Maintained
 
+HARDWARE MONITORING
+P:      Jean Delvare
+M:      khali@linux-fr.org
+L:      lm-sensors@lm-sensors.org
+W:      http://www.lm-sensors.nu/
+S:      Maintained
+
 HARMONY SOUND DRIVER
 P:      Kyle McMartin
 M:      kyle@parisc-linux.org
@@ -998,6 +1003,13 @@ M:	mike.miller@hp.com
 L:      iss_storagedev@hp.com
 S:      Supported
  
+HOST AP DRIVER
+P:      Jouni Malinen
+M:      jkmaline@cc.hut.fi
+L:      hostap@shmoo.com
+W:      http://hostap.epitest.fi/
+S:      Maintained
+
 HP100:  Driver for HP 10/100 Mbit/s Voice Grade Network Adapter Series
 P:      Jaroslav Kysela
 M:      perex@suse.cz
@@ -1014,7 +1026,7 @@ P:	William Irwin
 M:      wli@holomorphy.com
 S:      Maintained
 
-I2C AND SENSORS DRIVERS
+I2C SUBSYSTEM
 P:      Greg Kroah-Hartman
 M:      greg@kroah.com
 P:      Jean Delvare
@@ -1960,7 +1972,6 @@ S:	Supported
 
 ROCKETPORT DRIVER
 P:      Comtrol Corp.
-M:      support@comtrol.com
 W:      http://www.comtrol.com
 S:      Maintained
 
@@ -2099,6 +2110,12 @@ M:	support@simtec.co.uk
 W:      http://www.simtec.co.uk/products/EB2410ITX/
 S:      Supported
 
+SIS 190 ETHERNET DRIVER
+P:      Francois Romieu
+M:      romieu@fr.zoreil.com
+L:      netdev@vger.kernel.org
+S:      Maintained
+
 SIS 5513 IDE CONTROLLER DRIVER
 P:      Lionel Bouton
 M:      Lionel.Bouton@inet6.fr
@@ -2644,11 +2661,6 @@ S:	Maintained
 UCLINUX (AND M68KNOMMU)
 P:      Greg Ungerer
 M:      gerg@uclinux.org
-M:      gerg@snapgear.com
-P:      David McCullough
-M:      davidm@snapgear.com
-P:      D. Jeff Dionne (created first uClinux port)
-M:      jeff@uclinux.org
 W:      http://www.uclinux.org/
 L:      uclinux-dev@uclinux.org  (subscribers-only)
 S:      Maintained