Merge branch 'oprofile-for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git...

[pandora-kernel.git] / MAINTAINERS

diff --git a/MAINTAINERS b/MAINTAINERS
index a4035d7..0331618 100644 (file)
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5493,7 +5493,7 @@ S:        Maintained
 F:     drivers/mmc/host/tmio_mmc.*
 
 TMPFS (SHMEM FILESYSTEM)
 F:     drivers/mmc/host/tmio_mmc.*
 
 TMPFS (SHMEM FILESYSTEM)

-M:     Hugh Dickins <hugh.dickins@tiscali.co.uk>
+M:     Hugh Dickins <hughd@google.com>

 L:     linux-mm@kvack.org
 S:     Maintained
 F:     include/linux/shmem_fs.h
 L:     linux-mm@kvack.org
 S:     Maintained
 F:     include/linux/shmem_fs.h