Merge remote-tracking branch 'qemu/master'
commit3e78d89bbf43641d3f52e0f68608bf73d35aca4f
authorStefan Weil <sw@weilnetz.de>
Fri, 18 Sep 2015 17:02:58 +0000 (18 19:02 +0200)
committerStefan Weil <sw@weilnetz.de>
Fri, 18 Sep 2015 17:02:58 +0000 (18 19:02 +0200)
tree2724d0c77d8913f97ef75c3f3cd76988a207d5b7
parent813bf895c97d8e6e6f5e1c648cd3dfd06584702f
parent090d0bfd948343d522cd20bc634105b5cfe2483b
Merge remote-tracking branch 'qemu/master'

Conflicts:
configure
include/exec/cpu-all.h
include/qemu-common.h
linux-user/main.c
qemu-doc.texi

Signed-off-by: Stefan Weil <sw@weilnetz.de>
43 files changed:
MAINTAINERS
bsd-user/main.c
bsd-user/qemu.h
configure
cpu-exec.c
cpus.c
exec.c
hw/pci/pci.c
hw/ppc/spapr.c
include/exec/cpu-all.h
include/exec/exec-all.h
include/hw/boards.h
include/qemu-common.h
include/qom/cpu.h
include/sysemu/os-win32.h
linux-user/elfload.c
linux-user/main.c
linux-user/mmap.c
memory.c
monitor.c
qemu-doc.texi
rules.mak
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-m68k/translate.c
target-mips/cpu.h
target-mips/helper.c
target-mips/op_helper.c
target-sh4/translate.c
target-sparc/translate.c
tcg/i386/tcg-target.c
tcg/tcg.h
tests/Makefile
translate-all.c
ui/vnc.c
user-exec.c
vl.c