diff --git a/[refs] b/[refs]
index 88bbd42c8a91..ad7e0fe0123f 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 2f9ea55c98bd03265e1c3eb114718eb2974df4cb
+refs/heads/master: 6146b9af84cc771198195104b432eb13b96a9799
diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c
index a3afa0c387cd..938448067738 100644
--- a/trunk/drivers/char/tty_io.c
+++ b/trunk/drivers/char/tty_io.c
@@ -2085,7 +2085,7 @@ static int tioccons(struct file *file)
  *	the generic functionality existed. This piece of history is preserved
  *	in the expected tty API of posix OS's.
  *
- *	Locking: none, the open fle handle ensures it won't go away.
+ *	Locking: none, the open file handle ensures it won't go away.
  */
 
 static int fionbio(struct file *file, int __user *p)