diff --git a/[refs] b/[refs] index 2460deb32ea7..415618d5c956 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 53c550e9750434ddc4275fe0405170e0d1b46731 +refs/heads/master: f3f12faa7414595f502721c90c34deccc1a03c71 diff --git a/trunk/fs/ext4/super.c b/trunk/fs/ext4/super.c index 425f42778efa..9d2d9a7fdea1 100644 --- a/trunk/fs/ext4/super.c +++ b/trunk/fs/ext4/super.c @@ -945,8 +945,8 @@ static match_table_t tokens = { {Opt_mballoc, "mballoc"}, {Opt_nomballoc, "nomballoc"}, {Opt_stripe, "stripe=%u"}, - {Opt_err, NULL}, {Opt_resize, "resize"}, + {Opt_err, NULL}, }; static ext4_fsblk_t get_sb_block(void **data)