From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Wed, 10 Apr 2013 22:59:12 +0000 (-0700)
Subject: Merge tag 'tty-3.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: firefly_0821_release~3680^2~752
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7a92bc3856ec7e995ea9a0fb48c25e79ad395ea3;p=firefly-linux-kernel-4.4.55.git

Merge tag 'tty-3.9-rc6' of git://git./linux/kernel/git/gregkh/tty

Pull tty/serial fixes from Greg Kroah-Hartman:
 "Here are 4 small tty/serial fixes for 3.9.

  One fixes a bug where we broke the documentation build, and the others
  fix reported problems in some serial drivers.

  All have been in linux-next for a while"

* tag 'tty-3.9-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: mxser: fix cycle termination condition in mxser_probe() and mxser_module_init()
  Revert "tty/8250_pnp: serial port detection regression since v3.7"
  OMAP/serial: Revert bad fix of Rx FIFO threshold granularity
  tty: Documentation: fix a path in a DocBook template
---

7a92bc3856ec7e995ea9a0fb48c25e79ad395ea3