diff --git a/[refs] b/[refs]
index 9563d735d5d8..c6675afe27d2 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 70dc78da2cc76e7804c597fea3a0aff67ec8d7ad
+refs/heads/master: ecec6e34e18660799444c5a163c7313a20fba701
diff --git a/trunk/fs/nfsd/nfsd.h b/trunk/fs/nfsd/nfsd.h
index b76ac3a82e39..6b641cf2c19a 100644
--- a/trunk/fs/nfsd/nfsd.h
+++ b/trunk/fs/nfsd/nfsd.h
@@ -249,7 +249,7 @@ extern time_t nfsd4_grace;
 #define	COMPOUND_SLACK_SPACE		140    /* OP_GETFH */
 #define COMPOUND_ERR_SLACK_SPACE	12     /* OP_SETATTR */
 
-#define NFSD_LAUNDROMAT_MINTIMEOUT      10   /* seconds */
+#define NFSD_LAUNDROMAT_MINTIMEOUT      1   /* seconds */
 
 /*
  * The following attributes are currently not supported by the NFSv4 server: