diff options
| author | Anthony Liguori | 2011-10-31 17:09:00 +0100 |
|---|---|---|
| committer | Anthony Liguori | 2011-10-31 17:09:00 +0100 |
| commit | 8494a397b68124f9898e7912173d460ee99ba3e2 (patch) | |
| tree | 2c3ff12f56cb2587d00bab448a226d3cf0042d64 /linux-user | |
| parent | Merge remote-tracking branch 'aneesh/for-upstream-7' into staging (diff) | |
| parent | scsi-disk: add scsi-block for device passthrough (diff) | |
| download | qemu-8494a397b68124f9898e7912173d460ee99ba3e2.tar.gz qemu-8494a397b68124f9898e7912173d460ee99ba3e2.tar.xz qemu-8494a397b68124f9898e7912173d460ee99ba3e2.zip | |
Merge remote-tracking branch 'kwolf/for-anthony' into staging
Conflicts:
block/vmdk.c
Diffstat (limited to 'linux-user')
0 files changed, 0 insertions, 0 deletions