From b409a0ac7848710b2a03dd311dd30b8b8e446aa5 Mon Sep 17 00:00:00 2001
From: "Robert P. J. Day" <rpjday@crashcourse.ca>
Date: Mon, 31 Oct 2011 17:07:21 -0700
Subject: [PATCH] --- yaml --- r: 272119 b: refs/heads/master c:
 f5fc870da2f8798edb5481cd2137a3b2d5bd1b19 h: refs/heads/master i:   272117:
 7cc4046ba8ba20326a81e228201d3ad39d8e39f8   272115:
 992c2c7a6dccff43443a00c09ea31b1fe5c9f3b7   272111:
 2801ddf62657fff490df10c00f01206ff807457d v: v3

---
 [refs]           | 2 +-
 trunk/fs/Kconfig | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c496720262c9..0d0c3a0ed73c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 43362a4977e37db46f86f7e6ab935f0006956632
+refs/heads/master: f5fc870da2f8798edb5481cd2137a3b2d5bd1b19
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
index 9fe0b349f4cd..5f4c45d4aa10 100644
--- a/trunk/fs/Kconfig
+++ b/trunk/fs/Kconfig
@@ -109,7 +109,7 @@ source "fs/proc/Kconfig"
 source "fs/sysfs/Kconfig"
 
 config TMPFS
-	bool "Virtual memory file system support (former shm fs)"
+	bool "Tmpfs virtual memory file system support (former shm fs)"
 	depends on SHMEM
 	help
 	  Tmpfs is a file system which keeps all files in virtual memory.