diff options
| author | Peter Maydell <peter.maydell@linaro.org> | 2014-07-25 16:58:41 +0100 |
|---|---|---|
| committer | Peter Maydell <peter.maydell@linaro.org> | 2014-07-25 16:58:41 +0100 |
| commit | c60a57ff497667780132a3fcdc1500c83af5d5c0 (patch) | |
| tree | 6bd143526680483005a576f92dc2555f0116a22a /tests/acpi-test-data | |
| parent | 7f0b2ff7248f7621b375f108e54eed5690769c47 (diff) | |
| parent | 62c339c5272ce8fbe8ca52695cee8ff40da7872e (diff) | |
Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging
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>
Diffstat (limited to 'tests/acpi-test-data')
0 files changed, 0 insertions, 0 deletions