From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 28 Nov 2013 05:06:01 +0000 (-0800)
Subject: Merge tag 'tty-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: firefly_0821_release~176^2~4865
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=682a2512ea9db79abc570d9fd80928e7e6b18d1e;p=firefly-linux-kernel-4.4.55.git

Merge tag 'tty-3.13-rc2' of git://git./linux/kernel/git/gregkh/tty

Pull tty/serial fixes from Greg KH:
 "Here are some tty/serial driver fixes for reported issues in 3.13-rc2.

  The n_gsm "fix" was reverted as it was found to not be correct.
  Hopefully this will be resolved in a future pull request, but as
  there's really only one user of this line setting, it's not a big
  deal..."

* tag 'tty-3.13-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  Revert "n_gsm: race between ld close and gsmtty open"
  n_tty: Protect minimum_to_wake reset for concurrent readers
  tty: Reset hupped state on open
  TTY: amiserial, add missing platform check
  TTY: pmac_zilog, check existence of ports in pmz_console_init()
  n_gsm: race between ld close and gsmtty open
  tty/serial/8250: fix typo in help text
  n_tty: Fix 4096-byte canonical reads
  n_tty: Fix echo overrun tail computation
  n_tty: Ensure reader restarts worker for next reader
---

682a2512ea9db79abc570d9fd80928e7e6b18d1e