diff --git a/[refs] b/[refs]
index 1bd68c37b876..b43e5536883c 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5b5a285c7bab3851aa428a2ead14106a3f949788
+refs/heads/master: 03094f5e92738a7a408d76aa81c3f22252f59fb5
diff --git a/trunk/drivers/staging/autofs/TODO b/trunk/drivers/staging/autofs/TODO
index 32e26d2932e6..b1e663fe0748 100644
--- a/trunk/drivers/staging/autofs/TODO
+++ b/trunk/drivers/staging/autofs/TODO
@@ -1,8 +1,5 @@
-- step up and maintain this filesystem to ensure that it continues to
-  work.  There are lots of reported autofs3 bugs, and it uses the BKL,
-  which is going away.
-  If this does not happen, the will be removed in the 2.6.38 kernel
-  release.
+- Work to help people to migrate to autofs4.
+- This filesystem will be removed in the 2.6.38 kernel release.
 
 Please send patches to Greg Kroah-Hartman <greg@kroah.com> and
 Cc: H. Peter Anvin <hpa@zytor.com> and Arnd Bergmann <arnd@arndb.de>