From: Anthony Liguori <aliguori@us.ibm.com>
Date: Thu, 26 Apr 2012 20:22:07 +0000 (-0500)
Subject: Merge remote-tracking branch 'bonzini/nbd-next' into staging
X-Git-Tag: v1.1-rc0~32
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a75bfc5fdda8b87ff969d68e020ffdf1008751b1;p=thirdparty%2Fqemu.git

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

* bonzini/nbd-next:
  nbd: Fix uninitialised use of s->sock
---

a75bfc5fdda8b87ff969d68e020ffdf1008751b1