tree 85bc19d331715699e4adda08c88370a4952b73be
parent 6165daa4c8431d9d60382352864b46f34dd61ab4
parent 97ebbab0e324831dff47dbfa4bed55808cb3ec74
author Anthony Liguori <aliguori@us.ibm.com> 1366635914 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1366635914 -0500

Merge remote-tracking branch 'bonzini/nbd-next' into staging

# 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>