| commit | 734a333c8a10f2c90bac0351ec12bd615e1cc47c | |
| author | Avi Kivity <avi@redhat.com> | |
| Wed, 17 Sep 2008 05:51:16 +0000 (16 22:51 -0700) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Wed, 17 Sep 2008 06:04:54 +0000 (16 23:04 -0700) | ||
| tree | 4f78c5a756f5954ce8274d0f557122cff6d2a110 | treesnapshot (tar.gz zip) |
| parent | 1adc49cc28bd714b84aa0694fbf4f3a2c4104ae5 | commitdiff |
| parent | 73fd1bb3a5404f66e3d19e849eb10318cde77947 | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/block-raw-posix.c
qemu/hw/pc.c
qemu/monitor.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
qemu/block-raw-posix.c
qemu/hw/pc.c
qemu/monitor.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
27 files changed: