| commit | 6684018e217daa201cdb9067360ee294e389fd94 | |
| author | Avi Kivity <avi@qumranet.com> | |
| Mon, 28 Jan 2008 12:23:39 +0000 (28 14:23 +0200) | ||
| committer | Avi Kivity <avi@qumranet.com> | |
| Mon, 28 Jan 2008 12:23:39 +0000 (28 14:23 +0200) | ||
| tree | 9c736e6b8ac53bb742c7c62c05881e9a3f5710da | treesnapshot (tar.gz zip) |
| parent | 0f60874d58a000cf7817cc8b3fb385250834d732 | commitdiff |
| parent | 0019ad5346509406e93373b58d3066868ea30b96 | commitdiff |
Merge branch 'qemu-cvs'
Conflicts:
qemu/hw/ide.c
qemu/vl.c
Conflicts:
qemu/hw/ide.c
qemu/vl.c
16 files changed: