Merge remote branch 'amit/for-anthony' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Thu, 24 Mar 2011 13:11:58 +0000 (08:11 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Thu, 24 Mar 2011 13:11:58 +0000 (08:11 -0500)
1  2 
qemu-char.c

diff --cc qemu-char.c
Simple merge