Merge branch 'master' into for-next

[cascardo/linux.git] / fs / super.c

diff --git a/fs/super.c b/fs/super.c
index 74914b1..d78b984 100644 (file)
--- a/fs/super.c
+++ b/fs/super.c
@@ -285,7 +285,7 @@ static void put_super(struct super_block *sb)
  *     deactivate_locked_super -       drop an active reference to superblock
  *     @s: superblock to deactivate
  *
- *     Drops an active reference to superblock, converting it into a temprory
+ *     Drops an active reference to superblock, converting it into a temporary
  *     one if there is no other active references left.  In that case we
  *     tell fs driver to shut it down and drop the temporary reference we
  *     had just acquired.