| commit | 70bf05f84fe60958b8746e491eea74921bccbb2f | |
| author | Avi Kivity <avi@qumranet.com> | |
| Sun, 24 Aug 2008 11:58:07 +0000 (24 14:58 +0300) | ||
| committer | Avi Kivity <avi@qumranet.com> | |
| Sun, 24 Aug 2008 16:06:49 +0000 (24 19:06 +0300) | ||
| tree | 8890cb4e8cff4f0cc683e62b7a501d75328f4be8 | treesnapshot (tar.gz zip) |
| parent | 84cbd54e2cdfb7f0328f540f2fb8f2f4111be432 | commitdiff |
| parent | 9ca313aa0824f2d350a7a6c9b1ef6c47e0408f1d | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/console.h
qemu/hw/pc.c
qemu/hw/usb-uhci.c
qemu/monitor.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@qumranet.com>
Conflicts:
qemu/console.h
qemu/hw/pc.c
qemu/hw/usb-uhci.c
qemu/monitor.c
qemu/vl.c
Signed-off-by: Avi Kivity <avi@qumranet.com>
25 files changed: