Merge remote-tracking branch 'qemu/master'
commit5f97feebd2b49ed95150bc81ff492c2698cff3b4
authorStefan Weil <sw@weilnetz.de>
Mon, 7 Jul 2014 18:42:21 +0000 (7 20:42 +0200)
committerStefan Weil <sw@weilnetz.de>
Mon, 7 Jul 2014 18:42:21 +0000 (7 20:42 +0200)
treeffc5db2a9d9a4c745a7e1f0558c30b37553da644
parentd4aa8e24d5da5fe339e94b70157b62c224151fd9
parentc6ea9b73b12054ec96973d8b6bb7bf27f7d126cb
Merge remote-tracking branch 'qemu/master'
hw/pci/pci.c
qemu-char.c
tests/Makefile