diff options
| author |   Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-05 11:26:19 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2013-10-05 11:26:19 -0700 |
| commit | e3757a1f0b56bdb5da831e20976e5c69c11ff738 (patch) | |
| tree | 8dba3cf277b22ae0b13f840312d17e13d6217908 /tools/perf/util/scripting-engines/trace-event-python.c | |
| parent | Merge tag 'staging-3.12-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging (diff) | |
| parent | xen/hvc: allow xenboot console to be used again (diff) | |
| download | wireguard-linux-e3757a1f0b56bdb5da831e20976e5c69c11ff738.tar.xz wireguard-linux-e3757a1f0b56bdb5da831e20976e5c69c11ff738.zip | |
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
Diffstat (limited to 'tools/perf/util/scripting-engines/trace-event-python.c')
0 files changed, 0 insertions, 0 deletions