]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 16 Feb 2011 14:47:13 +0000 (08:47 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 16 Feb 2011 14:47:13 +0000 (08:47 -0600)
1  2 
qemu-common.h

diff --cc qemu-common.h
Simple merge