1 files changed, 17 insertions, 7 deletions

diff --git a/MAINTAINERS b/MAINTAINERS
index 380d2d5f08c9..a116b35c9a1e 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -1,4 +1,5 @@
 
+
         List of maintainers and how to submit kernel changes
 
 Please try to follow the guidelines below.  This will make things
@@ -3425,10 +3426,9 @@ S:	Maintained
 F:      drivers/net/ipg.*
 
 IPATH DRIVER
-M:      Ralph Campbell <infinipath@qlogic.com>
+M:      Mike Marciniszyn <infinipath@qlogic.com>
 L:      linux-rdma@vger.kernel.org
-T:      git git://git.qlogic.com/ipath-linux-2.6
-S:      Supported
+S:      Maintained
 F:      drivers/infiniband/hw/ipath/
 
 IPMI SUBSYSTEM
@@ -4590,9 +4590,8 @@ S:	Maintained
 F:      drivers/mmc/host/omap.c
 
 OMAP HS MMC SUPPORT
-M:      Madhusudhan Chikkature <madhu.cr@ti.com>
 L:      linux-omap@vger.kernel.org
-S:      Maintained
+S:      Orphan
 F:      drivers/mmc/host/omap_hsmmc.c
 
 OMAP RANDOM NUMBER GENERATOR SUPPORT
@@ -5158,6 +5157,12 @@ M:	Robert Jarzmik <robert.jarzmik@free.fr>
 L:      rtc-linux@googlegroups.com
 S:      Maintained
 
+QIB DRIVER
+M:      Mike Marciniszyn <infinipath@qlogic.com>
+L:      linux-rdma@vger.kernel.org
+S:      Supported
+F:      drivers/infiniband/hw/qib/
+
 QLOGIC QLA1280 SCSI DRIVER
 M:      Michael Reed <mdr@sgi.com>
 L:      linux-scsi@vger.kernel.org
@@ -6248,9 +6253,14 @@ F:	drivers/char/toshiba.c
 F:      include/linux/toshiba.h
 
 TMIO MMC DRIVER
+M:      Guennadi Liakhovetski <g.liakhovetski@gmx.de>
 M:      Ian Molton <ian@mnementh.co.uk>
+L:      linux-mmc@vger.kernel.org
 S:      Maintained
-F:      drivers/mmc/host/tmio_mmc.*
+F:      drivers/mmc/host/tmio_mmc*
+F:      drivers/mmc/host/sh_mobile_sdhi.c
+F:      include/linux/mmc/tmio.h
+F:      include/linux/mmc/sh_mobile_sdhi.h
 
 TMPFS (SHMEM FILESYSTEM)
 M:      Hugh Dickins <hughd@google.com>
@@ -6327,7 +6337,7 @@ F:	drivers/scsi/u14-34f.c
 
 UBI FILE SYSTEM (UBIFS)
 M:      Artem Bityutskiy <dedekind1@gmail.com>
-M:      Adrian Hunter <adrian.hunter@nokia.com>
+M:      Adrian Hunter <adrian.hunter@intel.com>
 L:      linux-mtd@lists.infradead.org
 T:      git git://git.infradead.org/ubifs-2.6.git
 W:      http://www.linux-mtd.infradead.org/doc/ubifs.html