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

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index 913a01f..81cf5fb 100644 (file)
--- 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
        List of maintainers and how to submit kernel changes
 
 Please try to follow the guidelines below.  This will make things


@@ -4289,8 +4290,8 @@ S:        Maintained
 F:     drivers/usb/musb/
 
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)
 F:     drivers/usb/musb/
 
 MYRICOM MYRI-10G 10GbE DRIVER (MYRI10GE)

+M:     Jon Mason <mason@myri.com>

 M:     Andrew Gallatin <gallatin@myri.com>
 M:     Andrew Gallatin <gallatin@myri.com>

-M:     Brice Goglin <brice@myri.com>

 L:     netdev@vger.kernel.org
 W:     http://www.myri.com/scs/download-Myri10GE.html
 S:     Supported
 L:     netdev@vger.kernel.org
 W:     http://www.myri.com/scs/download-Myri10GE.html
 S:     Supported


@@ -6241,9 +6242,14 @@ F:       drivers/char/toshiba.c
 F:     include/linux/toshiba.h
 
 TMIO MMC DRIVER
 F:     include/linux/toshiba.h
 
 TMIO MMC DRIVER

+M:     Guennadi Liakhovetski <g.liakhovetski@gmx.de>

 M:     Ian Molton <ian@mnementh.co.uk>
 M:     Ian Molton <ian@mnementh.co.uk>

+L:     linux-mmc@vger.kernel.org

 S:     Maintained
 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>
 
 TMPFS (SHMEM FILESYSTEM)
 M:     Hugh Dickins <hughd@google.com>


@@ -6320,7 +6326,7 @@ F:        drivers/scsi/u14-34f.c
 
 UBI FILE SYSTEM (UBIFS)
 M:     Artem Bityutskiy <dedekind1@gmail.com>
 
 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
 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