]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
Merge remote-tracking branch 'stefanha/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Fri, 9 Sep 2011 18:09:57 +0000 (13:09 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Fri, 9 Sep 2011 18:09:57 +0000 (13:09 -0500)
1  2 
vl.c

diff --cc vl.c
Simple merge