Merge remote-tracking branch 'qemu/master'
commitbbeb10f6e8c7a346c8a9697f40ab43c250aacb6c
authorStefan Weil <sw@weilnetz.de>
Sun, 22 Jan 2017 13:08:00 +0000 (22 14:08 +0100)
committerStefan Weil <sw@weilnetz.de>
Sun, 22 Jan 2017 13:08:00 +0000 (22 14:08 +0100)
tree38fc0fba2ca37d694f45fa52337bf14048782693
parent02c641883bee48f38a35a173af9820e08391f38d
parentd1c82f7cc34443841095f490345f86c9d8baca34
Merge remote-tracking branch 'qemu/master'

# Conflicts:
# Makefile

Signed-off-by: Stefan Weil <sw@weilnetz.de>
35 files changed:
Makefile
configure
docs/qmp-intro.txt
exec.c
hw/m68k/mcf5208.c
hw/pci/pci.c
hw/s390x/s390-pci-inst.c
hw/sh4/sh7750.c
hw/timer/Makefile.objs
include/block/block_int.h
include/exec/exec-all.h
include/qapi/error.h
linux-user/main.c
monitor.c
qemu-doc.texi
qom/cpu.c
rules.mak
target/arm/cpu.c
target/arm/cpu.h
target/arm/helper.c
target/cris/cpu.h
target/i386/cpu.h
target/i386/helper.c
target/i386/misc_helper.c
target/i386/svm_helper.c
target/m68k/op_helper.c
target/m68k/translate.c
target/microblaze/mmu.c
target/mips/cpu.h
target/mips/helper.c
target/mips/op_helper.c
target/ppc/translate_init.c
target/s390x/gdbstub.c
tcg/i386/tcg-target.inc.c
util/qemu-thread-win32.c