Merge remote-tracking branch 'qemu/master'
commit875666bc58ffc8dd7fdae5359534d115e35849c6
authorStefan Weil <sw@weilnetz.de>
Thu, 14 Jul 2016 19:22:17 +0000 (14 21:22 +0200)
committerStefan Weil <sw@weilnetz.de>
Thu, 14 Jul 2016 19:22:17 +0000 (14 21:22 +0200)
treec02984d3cb4c8b720b8427a27938d03ef643f540
parent2313ce9dd4a80605deaf088b36e4af78f162d991
parent14c7d99333e4a474c65bdae6f99aa8837e8078e6
Merge remote-tracking branch 'qemu/master'

Conflicts:
target-mips/op_helper.c
vl.c

Signed-off-by: Stefan Weil <sw@weilnetz.de>
39 files changed:
Makefile
configure
exec.c
hw/mips/mips_malta.c
hw/timer/Makefile.objs
include/block/block_int.h
include/exec/exec-all.h
include/hw/arm/arm.h
include/hw/char/serial.h
include/hw/pci/pci_ids.h
include/qemu/main-loop.h
include/qom/cpu.h
linux-user/sh4/target_syscall.h
migration/savevm.c
monitor.c
qemu-char.c
rules.mak
target-alpha/mem_helper.c
target-arm/cpu.h
target-arm/helper.c
target-arm/op_helper.c
target-cris/cpu.h
target-cris/op_helper.c
target-i386/cpu.h
target-i386/kvm.c
target-m68k/op_helper.c
target-microblaze/op_helper.c
target-mips/cpu.h
target-mips/helper.c
target-mips/op_helper.c
target-ppc/translate_init.c
target-sh4/op_helper.c
tests/libqos/libqos-pc.h
tests/libqos/libqos.h
translate-all.c
ui/vnc.c
ui/vnc.h
util/cutils.c
vl.c