Merge branch 'qemu-cvs'
commita472aedbd2d29912626c5c01e8c9e4831ae044fe
authorAvi Kivity <avi@redhat.com>
Thu, 25 Sep 2008 13:04:29 +0000 (25 16:04 +0300)
committerAvi Kivity <avi@redhat.com>
Thu, 25 Sep 2008 13:04:29 +0000 (25 16:04 +0300)
tree365879c041abcdffd56c719ae0b5a7b60d704495
parent35bf248ec594035d3d23665fedf46c85f329f171
parent00279e81dd32399d997bfccd964d46a27cffb1f0
Merge branch 'qemu-cvs'
qemu/Makefile
qemu/console.h
qemu/exec.c
qemu/hw/cirrus_vga.c
qemu/target-i386/helper.c