]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote branch 'mst/for_anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 19 Feb 2010 19:02:10 +0000 (13:02 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 19 Feb 2010 19:02:10 +0000 (13:02 -0600)
1  2 
qemu-common.h

diff --cc qemu-common.h
Simple merge