]> git.ipfire.org Git - thirdparty/qemu.git/commitdiff
Merge remote branch 'qmp/for-stable-0.13' into stable-0.13
authorAnthony Liguori <aliguori@us.ibm.com>
Tue, 12 Oct 2010 00:01:41 +0000 (19:01 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Tue, 12 Oct 2010 00:01:41 +0000 (19:01 -0500)
1  2 
buffered_file.c

diff --cc buffered_file.c
Simple merge