diff --git a/[refs] b/[refs]
index 1d68e67fd706..7cb30fa97450 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: dfc5d03f12e706c19ee37734184ea96582ef931d
+refs/heads/master: cd59e7b9781a35716b8a3e8c4aa2d48081d7daf7
diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c
index 686ebcc2e6c7..94a527261cae 100644
--- a/trunk/fs/ext4/super.c
+++ b/trunk/fs/ext4/super.c
@@ -1255,6 +1255,9 @@ static int parse_options (char *options, struct super_block *sb,
 		case Opt_quota:
 		case Opt_usrquota:
 		case Opt_grpquota:
+			printk(KERN_ERR
+				"EXT4-fs: quota options not supported.\n");
+			break;
 		case Opt_usrjquota:
 		case Opt_grpjquota:
 		case Opt_offusrjquota:
@@ -1262,7 +1265,7 @@ static int parse_options (char *options, struct super_block *sb,
 		case Opt_jqfmt_vfsold:
 		case Opt_jqfmt_vfsv0:
 			printk(KERN_ERR
-				"EXT4-fs: journalled quota options not "
+				"EXT4-fs: journaled quota options not "
 				"supported.\n");
 			break;
 		case Opt_noquota: