projects
/
qemu.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7f0b2ff
62c339c
)
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
author
Peter Maydell
<peter.maydell@linaro.org>
Fri, 25 Jul 2014 15:58:41 +0000
(16:58 +0100)
committer
Peter Maydell
<peter.maydell@linaro.org>
Fri, 25 Jul 2014 15:58:41 +0000
(16:58 +0100)
Here is the serial fix for 2.1.
# gpg: Signature made Fri 25 Jul 2014 13:36:23 BST using RSA key ID
9B4D86F2
# gpg: Good signature from "Paolo Bonzini <pbonzini@redhat.com>"
# gpg: aka "Paolo Bonzini <bonzini@gnu.org>"
* remotes/bonzini/tags/for-upstream:
qemu-char: ignore flow control if a PTY's slave is not connected
Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
Trivial merge