From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 5 Oct 2013 18:26:19 +0000 (-0700)
Subject: Merge tag 'tty-3.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
X-Git-Tag: v3.12-rc4~7
X-Git-Url: http://git.cascardo.eti.br/?a=commitdiff_plain;h=e3757a1f0b56bdb5da831e20976e5c69c11ff738;p=cascardo%2Flinux.git

Merge tag 'tty-3.12-rc4' of git://git./linux/kernel/git/gregkh/tty

Pull tty fixes from Greg KH:
 "Here are two tty driver fixes for 3.12-rc4.

  One fixes the reported regression in the n_tty code that a number of
  people found recently, and the other one fixes an issue with xen
  consoles that broke in 3.10"

* tag 'tty-3.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  xen/hvc: allow xenboot console to be used again
  tty: Fix pty master read() after slave closes
---

e3757a1f0b56bdb5da831e20976e5c69c11ff738