diff --git a/[refs] b/[refs]
index e8b74ab52383..9fd38b89a877 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 317602f3e01a25320a712195b32fcf19c1297121
+refs/heads/master: e8b43555a2a8c71e8501924e260f62b9545c598b
diff --git a/trunk/MAINTAINERS b/trunk/MAINTAINERS
index 0652ab384d51..c382ad39bb9b 100644
--- a/trunk/MAINTAINERS
+++ b/trunk/MAINTAINERS
@@ -2418,7 +2418,7 @@ L:	kernel-janitors@vger.kernel.org
 W:	http://www.kerneljanitors.org/
 S:	Maintained
 
-KERNEL NFSD
+KERNEL NFSD, SUNRPC, AND LOCKD SERVERS
 P:	J. Bruce Fields
 M:	bfields@fieldses.org
 P:	Neil Brown
@@ -3036,7 +3036,7 @@ M:	ja@ssi.bg
 L:	netdev@vger.kernel.org
 S:	Maintained
 
-NFS CLIENT
+NFS, SUNRPC, AND LOCKD CLIENTS
 P:	Trond Myklebust
 M:	Trond.Myklebust@netapp.com
 L:	linux-nfs@vger.kernel.org