summary refs log tree commit diff stats
path: root/hw/usb/dev-bluetooth.c
diff options
context:
space:
mode:
authorPeter Maydell <peter.maydell@linaro.org>2014-09-18 17:00:38 +0100
committerPeter Maydell <peter.maydell@linaro.org>2014-09-18 17:00:38 +0100
commitbb26a1e80b5639d71119ff58e0ef598708993fc0 (patch)
treecc9372e37a5dd53b87dc97deb39ed65faf4985fc /hw/usb/dev-bluetooth.c
parente4d50d47a9eb15f42bdd561803a29a4d7c3eb8ec (diff)
parent9d64fab42274fb50a39bab184f79d0239596ba4a (diff)
downloadfocaccia-qemu-bb26a1e80b5639d71119ff58e0ef598708993fc0.tar.gz
focaccia-qemu-bb26a1e80b5639d71119ff58e0ef598708993fc0.zip
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) <kraxel@redhat.com>"
# gpg:                 aka "Gerd Hoffmann <gerd@kraxel.org>"
# gpg:                 aka "Gerd Hoffmann (private) <kraxel@gmail.com>"

* 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 <peter.maydell@linaro.org>
Diffstat (limited to 'hw/usb/dev-bluetooth.c')
0 files changed, 0 insertions, 0 deletions