| commit | 145134f9fdd4c92f08c8c30af00b2daad35a02c9 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 7 Dec 2008 10:57:45 +0000 (7 12:57 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 7 Dec 2008 10:57:45 +0000 (7 12:57 +0200) | ||
| tree | 1b9ba45f5d0909e1d9b9a0e7a6ba5825c08eb9e1 | treesnapshot (tar.gz zip) |
| parent | 9a0d68240e9ddd1b41a7f058779bfc2cd5ec8145 | commitdiff |
| parent | 575750581c6ea70e89a7889cb6028f234f9d2ee9 | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile.target
qemu/configure
qemu/cutils.c
qemu/hw/pc.c
qemu/hw/ppc4xx.h
qemu/hw/virtio-balloon.c
qemu/hw/virtio-blk.c
qemu/hw/virtio.c
qemu/hw/virtio.h
qemu/monitor.c
qemu/qemu-common.h
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
qemu/Makefile.target
qemu/configure
qemu/cutils.c
qemu/hw/pc.c
qemu/hw/ppc4xx.h
qemu/hw/virtio-balloon.c
qemu/hw/virtio-blk.c
qemu/hw/virtio.c
qemu/hw/virtio.h
qemu/monitor.c
qemu/qemu-common.h
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
34 files changed: