diff --git a/[refs] b/[refs]
index 4cdb7e58232d..53df9329724a 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 3c3c10bba1e4ccb75b41442e45c1a072f6cded19
+refs/heads/master: 3e3417402b3bcaf0faf7995d426b848d7aa17c6e
diff --git a/trunk/fs/jffs2/scan.c b/trunk/fs/jffs2/scan.c
index c02737375854..a06d47a688c7 100644
--- a/trunk/fs/jffs2/scan.c
+++ b/trunk/fs/jffs2/scan.c
@@ -366,7 +366,7 @@ static int jffs2_scan_xattr_node(struct jffs2_sb_info *c, struct jffs2_erasebloc
 
 	if (jffs2_sum_active())
 		jffs2_sum_add_xattr_mem(s, rx, ofs - jeb->offset);
-	dbg_xattr("scaning xdatum at %#08x (xid=%u, version=%u)\n",
+	dbg_xattr("scanning xdatum at %#08x (xid=%u, version=%u)\n",
 		  ofs, xd->xid, xd->version);
 	return 0;
 }