]> git.proxmox.com Git - qemu.git/commitdiff
Merge remote-tracking branch 'bonzini/nbd-next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 22 Apr 2013 13:05:14 +0000 (08:05 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 22 Apr 2013 13:05:14 +0000 (08:05 -0500)
# By Stefan Hajnoczi
# Via Paolo Bonzini
* bonzini/nbd-next:
  nbd: set TCP_NODELAY
  nbd: use TCP_CORK in nbd_co_send_request()
  nbd: unlock mutex in nbd_co_send_request() error path

Message-id: 1366381830-11267-1-git-send-email-pbonzini@redhat.com
Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge