diff --git a/[refs] b/[refs]
index c0867cd4aea6..f8ab7aace89d 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2ab573487a98c06fdfb34308f641f09369d61fa2
+refs/heads/master: 673e1f31dfa16bc16a4c9a37a461270076d2c6ac
diff --git a/trunk/drivers/staging/autofs/TODO b/trunk/drivers/staging/autofs/TODO
index b1e663fe0748..543803d03993 100644
--- a/trunk/drivers/staging/autofs/TODO
+++ b/trunk/drivers/staging/autofs/TODO
@@ -1,5 +1,8 @@
-- Work to help people to migrate to autofs4.
-- This filesystem will be removed in the 2.6.38 kernel release.
+autofs version 3 is on its way out of the kernel,
+It has been replaced by autofs4 several years ago.
 
-Please send patches to Greg Kroah-Hartman <greg@kroah.com> and
-Cc: H. Peter Anvin <hpa@zytor.com> and Arnd Bergmann <arnd@arndb.de>
+The autofs3 code uses the big kernel lock which
+is getting deprecated.
+
+Users that find autofs3 to work but not autofs4
+should talk to Ian Kent <raven@themaw.net>.