Merge remote-tracking branch 'qemu/master'
commit10ffb23ce32735239eb47b4554f2e49ff790e88a
authorStefan Weil <sw@weilnetz.de>
Mon, 2 May 2016 17:05:17 +0000 (2 19:05 +0200)
committerStefan Weil <sw@weilnetz.de>
Mon, 2 May 2016 17:05:17 +0000 (2 19:05 +0200)
treee92aa24728112a835d6a751b0cf7531acdbc9140
parentd2ac739384cb82c0af3398fb136f6fca37935d4d
parent975eb6a547f809608ccb08c221552f666611af25
Merge remote-tracking branch 'qemu/master'
configure
include/qemu/main-loop.h
qemu-io.c
target-mips/op_helper.c
util/qemu-option.c
vl.c