Merge remote-tracking branch 'qemu/master'
commitccd5256692e16db6ef2245d04d91799768eabe3c
authorStefan Weil <sw@weilnetz.de>
Fri, 22 Jul 2016 19:58:42 +0000 (22 21:58 +0200)
committerStefan Weil <sw@weilnetz.de>
Fri, 22 Jul 2016 19:58:42 +0000 (22 21:58 +0200)
treeb36ddfe85084068348e9b8cb12819a4a95be67cc
parent5848c1d4dce52cf4e220bcfd5c8dab73e9f155d1
parent2d2e632ad00d11867c6c5625605b1fbc022dd62f
Merge remote-tracking branch 'qemu/master'
13 files changed:
configure
hw/arm/musicpal.c
hw/mips/gt64xxx_pci.c
hw/net/eepro100.c
hw/net/smc91c111.c
hw/pci/pci.c
include/block/block_int.h
linux-user/syscall.c
monitor.c
net/tap-win32.c
target-i386/cpu.h
target-i386/kvm.c
target-sh4/op_helper.c