]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
projects / lisovros / qemu_apohw.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 03b0ba7 14542fe)
Merge remote branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 23 Aug 2010 20:10:12 +0000 (15:10 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 23 Aug 2010 20:10:12 +0000 (15:10 -0500)
1  2 
kvm-all.c patch | diff1 | diff2 | blob | history

diff --cc kvm-all.c
Simple merge
Virtual HW used in A0B36APO subject