Anthony Liguori 8494a397b6 Merge remote-tracking branch 'kwolf/for-anthony' into staging ... Conflicts: block/vmdk.c		2011-10-31 11:09:00 -05:00
..
blkdebug.c
blkverify.c
bochs.c
cloop.c
cow.c
curl.c
dmg.c
iscsi.c
nbd.c
parallels.c
qcow2-cache.c
qcow2-cluster.c
qcow2-refcount.c
qcow2-snapshot.c
qcow2.c
qcow2.h
qcow.c
qed-check.c
qed-cluster.c
qed-gencb.c
qed-l2-cache.c
qed-table.c
qed.c
qed.h
raw-posix-aio.h
raw-posix.c
raw-win32.c
raw.c
rbd.c
sheepdog.c
vdi.c
vmdk.c	Merge remote-tracking branch 'kwolf/for-anthony' into staging	2011-10-31 11:09:00 -05:00
vpc.c
vvfat.c