Merge remote branch 'origin/master' into pci
commit6107ff12922e5508a44b376b40a3041810cb00d2
authorMichael S. Tsirkin <mst@redhat.com>
Mon, 10 Jan 2011 11:43:48 +0000 (10 13:43 +0200)
committerMichael S. Tsirkin <mst@redhat.com>
Mon, 10 Jan 2011 11:43:48 +0000 (10 13:43 +0200)
tree56098d53043a8fcdd01dbf0dca565ceab09f95b3
parentbe92bbf73dfd7d8a4786dc5f6c71590f4fbc5a32
parent8aaf42ed0f203da63860b0a3ab3ff2bdfe9b4cb0
Merge remote branch 'origin/master' into pci
Makefile.target
hmp-commands.hx
hw/cirrus_vga.c
sysemu.h
vl.c