diff --git a/[refs] b/[refs] index 504bb3359282..e4ebd61f4b33 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: c010b2f76c3032e48097a6eef291d8593d5d79a6 +refs/heads/master: 1bad879a078111748ebc27fb0d29e8c916556835 diff --git a/trunk/drivers/char/tty_io.c b/trunk/drivers/char/tty_io.c index 15e597d03002..fa48dba5ba5e 100644 --- a/trunk/drivers/char/tty_io.c +++ b/trunk/drivers/char/tty_io.c @@ -915,7 +915,7 @@ static void tty_reset_termios(struct tty_struct *tty) * do_tty_hangup - actual handler for hangup events * @work: tty device * -k * This can be called by the "eventd" kernel thread. That is process + * This can be called by the "eventd" kernel thread. That is process * synchronous but doesn't hold any locks, so we need to make sure we * have the appropriate locks for what we're doing. *