| commit | e3757a1f0b56bdb5da831e20976e5c69c11ff738 | [log] [tgz] |
|---|---|---|
| author | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 05 11:26:19 2013 -0700 |
| committer | Linus Torvalds <torvalds@linux-foundation.org> | Sat Oct 05 11:26:19 2013 -0700 |
| tree | 8dba3cf277b22ae0b13f840312d17e13d6217908 | |
| parent | 20fa78676370d98a6f1f354a937be7f2fa44b84e [diff] | |
| parent | a9fbf4d591da6cd1d3eaab826c7c15f77fc8f6a3 [diff] |
Merge tag 'tty-3.12-rc4' of git://git.kernel.org/pub/scm/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