| commit | d3088c02f83b8ea4091bf705225549cf79bbbdd0 | |
| author | Avi Kivity <avi@redhat.com> | |
| Sun, 23 Nov 2008 15:48:54 +0000 (23 17:48 +0200) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Sun, 23 Nov 2008 15:48:54 +0000 (23 17:48 +0200) | ||
| tree | 29c240cb576f80afd5988f328b390c806cd53390 | treesnapshot (tar.gz zip) |
| parent | e3c2b5239bfdf12b55035b01ec353dbc3e6fc9a9 | commitdiff |
| parent | 1c97856dcc4557f75eb9a86ec5300f9450a1e1a0 | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/block-raw-posix.c
qemu/configure
qemu/cpu-defs.h
qemu/cpu-exec.c
qemu/exec.c
qemu/gdbstub.c
qemu/loader.c
qemu/osdep.c
qemu/sysemu.h
qemu/target-i386/helper.c
qemu/target-ppc/cpu.h
qemu/target-ppc/helper.c
qemu/usb-linux.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
qemu/block-raw-posix.c
qemu/configure
qemu/cpu-defs.h
qemu/cpu-exec.c
qemu/exec.c
qemu/gdbstub.c
qemu/loader.c
qemu/osdep.c
qemu/sysemu.h
qemu/target-i386/helper.c
qemu/target-ppc/cpu.h
qemu/target-ppc/helper.c
qemu/usb-linux.c
Signed-off-by: Avi Kivity <avi@redhat.com>
29 files changed: