From: Peter Maydell Date: Thu, 18 Sep 2014 16:00:38 +0000 (+0100) Subject: Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20140918-1' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=bb26a1e80b5639d71119ff58e0ef598708993fc0;p=qemu.git Merge remote-tracking branch 'remotes/kraxel/tags/pull-vnc-20140918-1' into staging vnc: set TCP_NODELAY, cleanup in tlc code # gpg: Signature made Thu 18 Sep 2014 07:02:37 BST using RSA key ID D3E87138 # gpg: Good signature from "Gerd Hoffmann (work) " # gpg: aka "Gerd Hoffmann " # gpg: aka "Gerd Hoffmann (private) " * remotes/kraxel/tags/pull-vnc-20140918-1: vnc-tls: Clean up dead store in vnc_set_x509_credential() ui/vnc: set TCP_NODELAY Signed-off-by: Peter Maydell --- bb26a1e80b5639d71119ff58e0ef598708993fc0