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