Merge remote-tracking branch 'qemu/master'
commit6330b22940852b5b2186acc6650ed24df54344b1
authorStefan Weil <sw@weilnetz.de>
Mon, 8 Jan 2018 15:16:31 +0000 (8 16:16 +0100)
committerStefan Weil <sw@weilnetz.de>
Mon, 8 Jan 2018 15:16:31 +0000 (8 16:16 +0100)
tree4e6ac9f6ec4a24647c39bf6a7cdca9b4aad722d7
parent5f3ad6e518296df5c44696088cae805d0a4c9501
parent799044b6a3a0fc63e1e020e4d9266786a2dc7a0b
Merge remote-tracking branch 'qemu/master'
12 files changed:
block.c
configure
cpus.c
hw/net/eepro100.c
include/block/block_int.h
include/qom/cpu.h
qemu-doc.texi
qemu-options.hx
target/i386/cpu.h
target/i386/kvm.c
target/m68k/translate.c
vl.c