Merge remote branch 'kwolf/for-anthony' into staging
commitaab2e8f79ad253c760787ff3ce4d64967fed0003
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 8 Sep 2010 19:26:57 +0000 (8 14:26 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 8 Sep 2010 19:26:57 +0000 (8 14:26 -0500)
treebc837d155b4d558b71ad196c561f9e71c10136d0
parentdccbe6fbab47c9a2589f436e0592933b47cbe40b
parent7ec5e6a4ca43494949465f9f9f3d9e4c7c620503
Merge remote branch 'kwolf/for-anthony' into staging
hw/virtio.h
nbd.c
nbd.h
qemu-nbd.c