aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--Documentation/filesystems/tmpfs.txt2
-rw-r--r--MAINTAINERS8
-rw-r--r--mm/rmap.c2
3 files changed, 10 insertions, 2 deletions
diff --git a/Documentation/filesystems/tmpfs.txt b/Documentation/filesystems/tmpfs.txt
index 222437efd75a..3015da0c6b2a 100644
--- a/Documentation/filesystems/tmpfs.txt
+++ b/Documentation/filesystems/tmpfs.txt
@@ -133,4 +133,4 @@ RAM/SWAP in 10240 inodes and it is only accessible by root.
133Author: 133Author:
134 Christoph Rohland <cr@sap.com>, 1.12.01 134 Christoph Rohland <cr@sap.com>, 1.12.01
135Updated: 135Updated:
136 Hugh Dickins <hugh@veritas.com>, 4 June 2007 136 Hugh Dickins, 4 June 2007
diff --git a/MAINTAINERS b/MAINTAINERS
index 2b349ba4add4..64ea80e45e3b 100644
--- a/MAINTAINERS
+++ b/MAINTAINERS
@@ -5579,6 +5579,14 @@ M: ian@mnementh.co.uk
5579S: Maintained 5579S: Maintained
5580F: drivers/mmc/host/tmio_mmc.* 5580F: drivers/mmc/host/tmio_mmc.*
5581 5581
5582TMPFS (SHMEM FILESYSTEM)
5583P: Hugh Dickins
5584M: hugh.dickins@tiscali.co.uk
5585L: linux-mm@kvack.org
5586S: Maintained
5587F: include/linux/shmem_fs.h
5588F: mm/shmem.c
5589
5582TPM DEVICE DRIVER 5590TPM DEVICE DRIVER
5583P: Debora Velarde 5591P: Debora Velarde
5584M: debora@linux.vnet.ibm.com 5592M: debora@linux.vnet.ibm.com
diff --git a/mm/rmap.c b/mm/rmap.c
index 16521664010d..23122af32611 100644
--- a/mm/rmap.c
+++ b/mm/rmap.c
@@ -14,7 +14,7 @@
14 * Original design by Rik van Riel <riel@conectiva.com.br> 2001 14 * Original design by Rik van Riel <riel@conectiva.com.br> 2001
15 * File methods by Dave McCracken <dmccr@us.ibm.com> 2003, 2004 15 * File methods by Dave McCracken <dmccr@us.ibm.com> 2003, 2004
16 * Anonymous methods by Andrea Arcangeli <andrea@suse.de> 2004 16 * Anonymous methods by Andrea Arcangeli <andrea@suse.de> 2004
17 * Contributions by Hugh Dickins <hugh@veritas.com> 2003, 2004 17 * Contributions by Hugh Dickins 2003, 2004
18 */ 18 */
19 19
20/* 20/*