From: Anthony Liguori Date: Mon, 22 Apr 2013 13:05:14 +0000 (-0500) Subject: Merge remote-tracking branch 'bonzini/nbd-next' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=25690739f1f067b6d8b2e616d87b1d976db0db92;p=qemu.git 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 --- 25690739f1f067b6d8b2e616d87b1d976db0db92