Merge remote-tracking branch 'qemu/master'
commit6a60bd45dbebf7cc9dab1a8b3330ce28cb558434
authorStefan Weil <sw@weilnetz.de>
Fri, 18 Sep 2015 19:07:37 +0000 (18 21:07 +0200)
committerStefan Weil <sw@weilnetz.de>
Fri, 18 Sep 2015 19:07:37 +0000 (18 21:07 +0200)
tree14864d756a555edc0d9f5e70f95eeebfef31a8aa
parent3e78d89bbf43641d3f52e0f68608bf73d35aca4f
parentffa4822c015d5670ef6a2239f3cbd2ff2cec57de
Merge remote-tracking branch 'qemu/master'

Conflicts:
Makefile
Makefile.target
configure
cpu-exec.c
hw/net/ne2000.c
include/qom/cpu.h
linux-user/signal.c
po/hu.po
po/it.po
po/messages.po
po/tr.po
target-i386/translate.c
target-mips/helper.c
target-sh4/helper.c
target-sh4/op_helper.c
tcg/tcg.c
ui/vnc.c
ui/vnc.h

Signed-off-by: Stefan Weil <sw@weilnetz.de>
85 files changed:
MAINTAINERS
Makefile
Makefile.target
block/vhdx.c
bsd-user/qemu.h
configure
cpu-exec.c
cpus.c
default-configs/arm-softmmu.mak
exec.c
hw/arm/Makefile.objs
hw/arm/armv7m.c
hw/arm/boot.c
hw/arm/exynos4210.c
hw/arm/musicpal.c
hw/display/vga.c
hw/m68k/mcf5208.c
hw/mips/cputimer.c
hw/mips/mips_malta.c
hw/mips/mips_r4k.c
hw/net/smc91c111.c
hw/pci/pci.c
hw/ppc/ppc405_boards.c
hw/ppc/prep.c
include/exec/cpu-all.h
include/exec/exec-all.h
include/hw/boards.h
include/qemu-common.h
include/qemu/main-loop.h
include/qom/cpu.h
include/qom/object.h
linux-user/elfload.c
linux-user/main.c
linux-user/qemu.h
linux-user/syscall.c
memory.c
monitor.c
os-win32.c
po/de_DE.po
po/fr_FR.po
po/hu.po
po/it.po
po/tr.po
qemu-char.c
qemu-doc.texi
qemu-img.c
qemu-io.c
qemu-options.hx
qom/object.c
target-alpha/mem_helper.c
target-arm/arm-semi.c
target-arm/cpu.c
target-arm/cpu.h
target-arm/helper.c
target-arm/translate.c
target-cris/cpu.h
target-cris/translate.c
target-i386/cpu.c
target-i386/cpu.h
target-i386/helper.h
target-i386/kvm.c
target-i386/misc_helper.c
target-i386/seg_helper.c
target-i386/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-sh4/helper.c
target-sh4/translate.c
target-sparc/translate.c
tcg/i386/tcg-target.c
tcg/tcg.c
tcg/tcg.h
tests/Makefile
tests/qemu-iotests/common.rc
tests/test-qmp-input-visitor.c
translate-all.c
ui/vnc.c
ui/vnc.h
util/cutils.c
util/error.c
util/qemu-option.c
vl.c