| commit | 863f7b922254caf48087fb82f3e37aa18e725a38 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 9 Nov 2008 17:14:21 +0000 (9 19:14 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 9 Nov 2008 18:37:58 +0000 (9 20:37 +0200) | ||
| tree | b9cf0d74054538e659d28f041a601256e9382933 | treesnapshot (tar.gz zip) |
| parent | ba2b62d42a025d9ab371ecb441ad1cb8007d9f34 | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/block.c
qemu/configure
qemu/cpu-exec.c
qemu/exec.c
qemu/hw/acpi.c
qemu/hw/pc.c
qemu/monitor.c
qemu/target-i386/cpu.h
qemu/target-i386/helper.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
qemu/block.c
qemu/configure
qemu/cpu-exec.c
qemu/exec.c
qemu/hw/acpi.c
qemu/hw/pc.c
qemu/monitor.c
qemu/target-i386/cpu.h
qemu/target-i386/helper.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
| configure | diffblobblamehistory | |
| kvm/configure | diffblobblamehistory |