]> rtime.felk.cvut.cz Git - lisovros/qemu_apohw.git/commitdiff
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 8 Aug 2011 19:38:42 +0000 (14:38 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 8 Aug 2011 19:38:42 +0000 (14:38 -0500)
1  2 
qemu-common.h
target-i386/cpu.h

diff --cc qemu-common.h
Simple merge
Simple merge