Merge tag 'tty-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Jun 2013 19:00:28 +0000 (09:00 -1000)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 22 Jun 2013 19:00:28 +0000 (09:00 -1000)
commitdcfdc28f300380ad31033aa0bfb8cf80f23c453a
tree14fdc07ba17f7bb920057c785cf77c06d1039ca4
parent67e5b2fad4e9848a954fd97de0509ec5cb6e6d47
parent7c61c3d8f44d5d822f758754287af644307b4af9
Merge tag 'tty-3.10-rc6' of git://git./linux/kernel/git/gregkh/tty

Pul tty fixes from Greg Kroah-Hartman:
 "Here are two tty core fixes that resolve some regressions that have
  been reported recently.  Both tiny fixes, but needed"

* tag 'tty-3.10-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty:
  tty: Fix transient pty write() EIO
  tty/vt: Return EBUSY if deallocating VT1 and it is busy