| commit | 57ba4c938c1cb6e8cd7501338c9dbcbb62575a05 | |
| author | Avi Kivity <avi@redhat.com> | |
| Mon, 2 Feb 2009 14:56:18 +0000 (2 16:56 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Mon, 2 Feb 2009 14:56:18 +0000 (2 16:56 +0200) | ||
| tree | 5495664032071b4593959b9dd911e3d891830b54 | treesnapshot (tar.gz zip) |
| parent | 77905a33008b4d0a80effd8ed9902de09d29bdc6 | commitdiff |
| parent | a5e50b263a54a41239a90930c1a27ecb76531e1b | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/hw/pci.c
qemu/hw/virtio-blk.c
qemu/target-i386/machine.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
qemu/hw/pci.c
qemu/hw/virtio-blk.c
qemu/target-i386/machine.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
40 files changed: