Merge branch 'for-next' into for-linus

Conflicts:

	kernel/irq/chip.c

1 files changed, 1 insertions, 1 deletions

diff --git a/drivers/char/tty_ioctl.c b/drivers/char/tty_ioctl.c
index 8e67d5c642a4..6bd5f8866c74 100644
--- a/drivers/char/tty_ioctl.c
+++ b/drivers/char/tty_ioctl.c
@@ -315,7 +315,7 @@ EXPORT_SYMBOL(tty_termios_input_baud_rate);
  *      For maximal back compatibility with legacy SYS5/POSIX *nix behaviour
  *      we need to carefully set the bits when the user does not get the
  *      desired speed. We allow small margins and preserve as much of possible
- *      of the input intent to keep compatiblity.
+ *      of the input intent to keep compatibility.
  *
  *      Locking: Caller should hold termios lock. This is already held
  *      when calling this function from the driver termios handler.