From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 22 Nov 2011 04:36:46 +0000 (-0800)
Subject: Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: MMI-PSA29.97-13-9~17986
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=3b9abc7e48561b0b140ee267e190bc1031f82ff3;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge branch 'tty-linus' of git://git./linux/kernel/git/gregkh/tty

* 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  TTY: ldisc, wait for ldisc infinitely in hangup
  TTY: ldisc, move wait idle to caller
  TTY: ldisc, allow waiting for ldisc arbitrarily long
  Revert "tty/serial: Prevent drop of DCD on suspend for Tegra UARTs"
  RS485: fix inconsistencies in the meaning of some variables
  pch_uart: Fix DMA resource leak issue
  serial,mfd: Fix CMSPAR setup
  tty/serial: Prevent drop of DCD on suspend for Tegra UARTs
  pch_uart: Change company name OKI SEMICONDUCTOR to LAPIS Semiconductor
  pch_uart: Support new device LAPIS Semiconductor ML7831 IOH
  pch_uart: Fix hw-flow control issue
  tty: hvc_dcc: Fix duplicate character inputs
  jsm: Change maintainership
---

3b9abc7e48561b0b140ee267e190bc1031f82ff3