| commit | ce1dfb7a1078decf340714eaec57db9533dc8af6 | |
| author | Avi Kivity <avi@redhat.com> | |
| Wed, 14 Jan 2009 11:18:20 +0000 (14 13:18 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Wed, 14 Jan 2009 11:18:20 +0000 (14 13:18 +0200) | ||
| tree | b37e11381f56087ea4dc652c2a5b0b8d66f24fe2 | treesnapshot (tar.gz zip) |
| parent | d968379668da73f3d8aa4a1789c86ad532736c04 | commitdiff |
| parent | 1eff7fbf116790aaacc8f89def68be11149626cc | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile
qemu/hw/mips_malta.c
qemu/hw/pc.c
qemu/hw/pci.c
qemu/hw/pci.h
qemu/hw/ppc_chrp.c
qemu/hw/ppc_prep.c
qemu/hw/realview.c
qemu/hw/sun4u.c
qemu/hw/versatilepb.c
qemu/hw/virtio-net.c
qemu/monitor.c
qemu/net.c
qemu/net.h
qemu/pc-bios/bios.bin
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
qemu/Makefile
qemu/hw/mips_malta.c
qemu/hw/pc.c
qemu/hw/pci.c
qemu/hw/pci.h
qemu/hw/ppc_chrp.c
qemu/hw/ppc_prep.c
qemu/hw/realview.c
qemu/hw/sun4u.c
qemu/hw/versatilepb.c
qemu/hw/virtio-net.c
qemu/monitor.c
qemu/net.c
qemu/net.h
qemu/pc-bios/bios.bin
Signed-off-by: Avi Kivity <avi@redhat.com>
19 files changed: