]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: f5eef2c b3adf53)
Merge remote-tracking branch 'bonzini/nbd-next' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 26 Apr 2012 20:22:07 +0000 (15:22 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 26 Apr 2012 20:22:07 +0000 (15:22 -0500)
* bonzini/nbd-next:
  nbd: Fix uninitialised use of s->sock


Trivial merge
Qemu copy for testing