diff --git a/[refs] b/[refs]
index d873f71fbca9..a9884ca38cd4 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: a77b645609084c030020bc58639d92da4316f410
+refs/heads/master: ea0985ad7914d8226a81d0f1374ece7832e75e95
diff --git a/trunk/fs/Kconfig b/trunk/fs/Kconfig
index dc06033f8502..d8062745716a 100644
--- a/trunk/fs/Kconfig
+++ b/trunk/fs/Kconfig
@@ -1547,8 +1547,20 @@ config UFS_DEBUG
 
 endmenu
 
-menu "Network File Systems"
+menuconfig NETWORK_FILESYSTEMS
+	bool "Network File Systems"
+	default y
 	depends on NET
+	---help---
+	  Say Y here to get to see options for network filesystems and
+	  filesystem-related networking code, such as NFS daemon and
+	  RPCSEC security modules.
+	  This option alone does not add any kernel code.
+
+	  If you say N, all options in this submenu will be skipped and
+	  disabled; if unsure, say Y here.
+
+if NETWORK_FILESYSTEMS
 
 config NFS_FS
 	tristate "NFS file system support"
@@ -2094,7 +2106,7 @@ config 9P_FS
 
 	  If unsure, say N.
 
-endmenu
+endif # NETWORK_FILESYSTEMS
 
 if BLOCK
 menu "Partition Types"