diff options
| author | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
|---|---|---|
| committer | Jens Axboe <jens.axboe@oracle.com> | 2010-03-19 03:05:10 -0400 |
| commit | b4b7a4ef097f288f724420b473dbf92a89c0ab7e (patch) | |
| tree | 23ad8101e3e77c32a8d1e1b95a9c1cd7f7a475b7 /drivers/char/pty.c | |
| parent | e9ce335df51ff782035a15c261a3c0c9892a1767 (diff) | |
| parent | a3d3203e4bb40f253b1541e310dc0f9305be7c84 (diff) | |
Merge branch 'master' into for-linus
Conflicts:
block/Kconfig
Signed-off-by: Jens Axboe <jens.axboe@oracle.com>
Diffstat (limited to 'drivers/char/pty.c')
| -rw-r--r-- | drivers/char/pty.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/char/pty.c b/drivers/char/pty.c index 385c44b3034f..5ee424817263 100644 --- a/drivers/char/pty.c +++ b/drivers/char/pty.c | |||
| @@ -220,7 +220,7 @@ static void pty_set_termios(struct tty_struct *tty, | |||
| 220 | * @tty: tty being resized | 220 | * @tty: tty being resized |
| 221 | * @ws: window size being set. | 221 | * @ws: window size being set. |
| 222 | * | 222 | * |
| 223 | * Update the termios variables and send the neccessary signals to | 223 | * Update the termios variables and send the necessary signals to |
| 224 | * peform a terminal resize correctly | 224 | * peform a terminal resize correctly |
| 225 | */ | 225 | */ |
| 226 | 226 | ||