| commit | 893f8ff2764314e9539fb2fd5d30713b8d40b106 | |
| author | Avi Kivity <avi@redhat.com> | |
| Tue, 23 Sep 2008 11:00:13 +0000 (23 14:00 +0300) | ||
| committer | Avi Kivity <avi@redhat.com> | |
| Tue, 23 Sep 2008 11:00:13 +0000 (23 14:00 +0300) | ||
| tree | 0836bc8baf7a75bf5faa9e721701c11591fef3f8 | treesnapshot (tar.gz zip) |
| parent | 75fc7c7072a58ce804c525a3321fb5a5961c6d93 | commitdiff |
| parent | 828899865fa31f3fc1c2d4c4491a1292ed70c838 | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/Makefile.target
qemu/block-raw-posix.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
Conflicts:
qemu/Makefile.target
qemu/block-raw-posix.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@redhat.com>
24 files changed: