]> git.proxmox.com Git - mirror_qemu.git/commitdiff
Merge remote branch 'kwolf/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 6 Jul 2010 13:31:43 +0000 (08:31 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 6 Jul 2010 13:31:43 +0000 (08:31 -0500)
1  2 
blockdev.c

diff --cc blockdev.c
Simple merge