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.