diff --git a/[refs] b/[refs]
index 8250e3372ed5..7000ee118ce1 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 1437085c3780f064a06df662195a2695e7d75c09
+refs/heads/master: 85becc535b7f33be5aefdb8ecea9fac4998e4b6f
diff --git a/trunk/fs/jffs2/build.c b/trunk/fs/jffs2/build.c
index 8c27c12816ba..722a6b682951 100644
--- a/trunk/fs/jffs2/build.c
+++ b/trunk/fs/jffs2/build.c
@@ -289,7 +289,7 @@ static void jffs2_calc_trigger_levels(struct jffs2_sb_info *c)
 	   trigger the GC thread even if we don't _need_ the space. When we
 	   can't mark nodes obsolete on the medium, the old dirty nodes cause
 	   performance problems because we have to inspect and discard them. */
-	c->vdirty_blocks_gctrigger = c->resv_blocks_gcmerge;
+	c->vdirty_blocks_gctrigger = c->resv_blocks_gctrigger;
 	if (jffs2_can_mark_obsolete(c))
 		c->vdirty_blocks_gctrigger *= 10;