OSDN Git Service

Merge remote-tracking branch 'kwolf/block-stable' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 18 Nov 2011 19:30:08 +0000 (13:30 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 18 Nov 2011 19:30:08 +0000 (13:30 -0600)
1  2 
qemu-doc.texi

diff --cc qemu-doc.texi
Simple merge