Merge remote-tracking branch 'qemu/master'
commitcd11a0317f9f3b0a7f2b5a166347351e51013aea
authorStefan Weil <sw@weilnetz.de>
Tue, 10 Nov 2015 21:12:05 +0000 (10 22:12 +0100)
committerStefan Weil <sw@weilnetz.de>
Tue, 10 Nov 2015 21:12:05 +0000 (10 22:12 +0100)
tree8dbdd06b7ba206ba2815b9e4fd2e665d4a6583ff
parent67d35d25f312cb07baa73442d4c9489ef863ca6b
parenta8b4f9585a0bf5186fca793ce2c5d754cd8ec49a
Merge remote-tracking branch 'qemu/master'

Conflicts:
README
configure
cpu-exec.c
exec.c
tests/Makefile

Signed-off-by: Stefan Weil <sw@weilnetz.de>
73 files changed:
MAINTAINERS
Makefile
block/raw-win32.c
block/vhdx.c
bsd-user/main.c
configure
cpu-exec.c
cpus.c
default-configs/pci.mak
docs/qmp-intro.txt
docs/tracing.txt
exec.c
hw/arm/armv7m.c
hw/arm/boot.c
hw/bt/sdp.c
hw/display/Makefile.objs
hw/input/ps2.c
hw/mips/mips_malta.c
hw/pci/pci.c
hw/ppc/prep.c
hw/ppc/spapr.c
hw/scsi/megasas.c
hw/sd/bcm2835_emmc.c
include/block/block_int.h
include/exec/exec-all.h
include/hw/arm/arm.h
include/qemu-common.h
include/qemu/sockets.h
include/qom/cpu.h
include/qom/object.h
linux-user/elfload.c
linux-user/main.c
linux-user/syscall.c
memory.c
monitor.c
net/tap-win32.c
qemu-char.c
qemu-doc.texi
qemu-img.c
qemu-options.hx
qom/object.c
target-arm/cpu.c
target-arm/cpu.h
target-arm/helper.c
target-arm/op_helper.c
target-arm/translate.c
target-cris/translate.c
target-i386/cpu.c
target-i386/cpu.h
target-i386/helper.h
target-i386/kvm.c
target-i386/seg_helper.c
target-i386/translate.c
target-m68k/translate.c
target-microblaze/op_helper.c
target-mips/cpu.h
target-mips/helper.c
target-mips/op_helper.c
target-ppc/translate.c
target-ppc/translate_init.c
target-sh4/translate.c
target-sparc/translate.c
tests/ide-test.c
tests/libqtest.c
tests/test-qmp-input-visitor.c
translate-all.c
ui/console.c
ui/vnc.c
ui/vnc.h
util/coroutine-win32.c
util/error.c
util/oslib-win32.c
vl.c