commit | 9c2e8d239627662b3e0f2e7c5ea7ba2877101426 | [log] [tgz] |
---|---|---|
author | Avi Kivity <avi@qumranet.com> | Thu Jul 10 12:22:20 2008 +0300 |
committer | Avi Kivity <avi@qumranet.com> | Thu Jul 10 12:22:20 2008 +0300 |
tree | 9c4b887eef0450f2647cd981e492440b0a284cd8 | |
parent | f0be35452b5710f14c0710244d050d1ba6778764 [diff] | |
parent | adf7d8fb44a47e3b4d7cdbf1f1c229b853ad97ed [diff] |
Merge branch 'qemu-cvs' Conflicts: qemu/block-raw-posix.c qemu/configure qemu/exec.c qemu/hw/pc.c qemu/sysemu.h qemu/vl.c Signed-off-by: Avi Kivity <avi@qumranet.com>