From: Peter Maydell Date: Fri, 25 Jul 2014 15:58:41 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/bonzini/tags/for-upstream' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c60a57ff497667780132a3fcdc1500c83af5d5c0;p=qemu.git 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 " # gpg: aka "Paolo Bonzini " * remotes/bonzini/tags/for-upstream: qemu-char: ignore flow control if a PTY's slave is not connected Signed-off-by: Peter Maydell --- c60a57ff497667780132a3fcdc1500c83af5d5c0