summaryrefslogtreecommitdiff
path: root/MAINTAINERS
diff options
context:
space:
mode:
authorJ. Bruce Fields <bfields@citi.umich.edu>2010-06-09 04:05:18 +0400
committerJ. Bruce Fields <bfields@citi.umich.edu>2010-06-09 04:05:18 +0400
commit44b56603c4c476b845a824cff6fe905c6268b2a1 (patch)
treeb7e792414fef2390718a657765719fbbb529ce84 /MAINTAINERS
parentc3935e30495869dd611e1cd62253c94ebc7c6c04 (diff)
parentb160fdabe93a8a53094f90f02bf4dcb500782aab (diff)
downloadlinux-44b56603c4c476b845a824cff6fe905c6268b2a1.tar.xz
Merge branch 'for-2.6.34-incoming' into for-2.6.35-incoming
Diffstat (limited to 'MAINTAINERS')
-rw-r--r--MAINTAINERS2
1 files changed, 1 insertions, 1 deletions
diff --git a/MAINTAINERS b/MAINTAINERS
index d5b0b1b6dc52..d329b053a718 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5492,7 +5492,7 @@ S: Maintained
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