Merge branch 'master' into for-next

[net-next-2.6.git] / fs / ext4 / super.c

diff --git a/fs/ext4/super.c b/fs/ext4/super.c
index 4e8983a9811b2205773809fad4306f4a79eef8c5..e72d3235b2fdbd8836896e4cd60dc81d155da2ff 100644 (file)
--- a/fs/ext4/super.c
+++ b/fs/ext4/super.c
@@ -3010,7 +3010,7 @@ no_journal:
        ext4_ext_init(sb);
        err = ext4_mb_init(sb, needs_recovery);
        if (err) {
-               ext4_msg(sb, KERN_ERR, "failed to initalize mballoc (%d)",
+               ext4_msg(sb, KERN_ERR, "failed to initialize mballoc (%d)",
                         err);
                goto failed_mount4;
        }