Merge remote-tracking branch 'qemu/master'
commit2313ce9dd4a80605deaf088b36e4af78f162d991
authorStefan Weil <sw@weilnetz.de>
Thu, 7 Jul 2016 20:59:12 +0000 (7 22:59 +0200)
committerStefan Weil <sw@weilnetz.de>
Thu, 7 Jul 2016 20:59:12 +0000 (7 22:59 +0200)
tree58774d1fcc68e7119fc9af79a30fa2f220e21006
parent05f6c531d0e3049059553e9684df7058289b9eb7
parent4f4a9ca4a4386c137301b3662faba076455ff15a
Merge remote-tracking branch 'qemu/master'

Conflicts:
MAINTAINERS
Makefile
configure
include/qom/cpu.h
linux-user/main.c
linux-user/qemu.h
linux-user/syscall.c
target-moxie/mmu.h
user-exec.c
vl.c

Signed-off-by: Stefan Weil <sw@weilnetz.de>
79 files changed:
MAINTAINERS
Makefile
Makefile.target
block/Makefile.objs
block/raw-win32.c
block/vhdx.c
bsd-user/main.c
configure
cpus.c
default-configs/arm-softmmu.mak
default-configs/pci.mak
docs/tracing.txt
exec.c
hw/arm/bcm2835_peripherals.c
hw/char/serial.c
hw/display/vga.c
hw/display/xenfb.c
hw/misc/Makefile.objs
hw/net/eepro100.c
hw/pci/pci.c
hw/ppc/ppce500_spin.c
hw/ppc/prep.c
hw/scsi/megasas.c
include/block/block_int.h
include/exec/cpu-all.h
include/exec/exec-all.h
include/hw/char/serial.h
include/qapi/error.h
include/qemu-common.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
migration/savevm.c
monitor.c
po/Makefile
qemu-char.c
qemu-io.c
qemu-options.hx
qobject/json-parser.c
qom/object.c
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/cpu.h
target-cris/translate.c
target-i386/cpu.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/op_helper.c
target-ppc/excp_helper.c
target-ppc/translate_init.c
tcg/i386/tcg-target.inc.c
tcg/tcg.c
tcg/tcg.h
tests/ahci-test.c
tests/ide-test.c
tests/libqos/libqos.c
tests/libqtest.c
tests/test-qmp-input-visitor.c
translate-all.c
ui/console.c
ui/vnc.c
ui/vnc.h
user-exec.c
util/cutils.c
util/error.c
util/oslib-win32.c
vl.c