Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
commit986563b173ca2d4bd47b10455b19c86e5cd5bba2
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 8 Aug 2011 19:38:42 +0000 (8 14:38 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 8 Aug 2011 19:38:42 +0000 (8 14:38 -0500)
tree25db73df4cb973bf86c58341cb82415ab8d2c90b
parent039523397fce67ccb15a9b71ef812f9a69286aa5
parentac363c9042eb1010b88af0a202c09475ef909972
Merge remote-tracking branch 'qemu-kvm/uq/master' into staging
qemu-common.h
target-i386/cpu.h