Merge tag 'v2.4.0-rc1'
commit03cfaec507ba73b59fedaac65e1f7d2ba515dce6
authorStefan Weil <sw@weilnetz.de>
Sat, 18 Jul 2015 08:01:13 +0000 (18 10:01 +0200)
committerStefan Weil <sw@weilnetz.de>
Sat, 18 Jul 2015 08:01:13 +0000 (18 10:01 +0200)
tree469db37aa19a8601697879fe7f247e55a2ffb004
parent34738355206af057e4739b79b5d1b43be5f45115
parentb4329bf41c86bac8b56cadb097081960cc4839a0
Merge tag 'v2.4.0-rc1'

v2.4.0-rc1 release

# gpg: Unterschrift vom Do 16 Jul 2015 21:32:20 CEST mittels RSA-Schlüssel ID 14360CDE
# gpg: Unterschrift kann nicht geprüft werden: Öffentlicher Schlüssel nicht gefunden

Conflicts:
Makefile
cpu-exec.c
default-configs/mips-softmmu.mak
default-configs/mipsel-softmmu.mak
disas/cris.c
exec.c
hw/mips/Makefile.objs
hw/mips/mips_malta.c
hw/ppc/spapr.c
include/qemu-common.h
linux-user/mmap.c
memory.c
target-i386/ioport-user.c

Signed-off-by: Stefan Weil <sw@weilnetz.de>
93 files changed:
MAINTAINERS
Makefile
Makefile.target
block/Makefile.objs
block/raw-win32.c
bsd-user/main.c
configure
cpu-exec.c
cpus.c
default-configs/mips-softmmu.mak
default-configs/mipsel-softmmu.mak
disas/cris.c
exec.c
hw/arm/boot.c
hw/arm/pxa2xx_pic.c
hw/char/serial.c
hw/display/Makefile.objs
hw/display/vga.c
hw/i386/acpi-build.c
hw/input/ps2.c
hw/mips/Makefile.objs
hw/mips/mips_malta.c
hw/pci/pci.c
hw/ppc/prep.c
hw/ppc/spapr.c
hw/scsi/megasas.c
include/block/block_int.h
include/exec/cpu-all.h
include/exec/exec-all.h
include/hw/arm/arm.h
include/hw/boards.h
include/hw/pci/pci_ids.h
include/qemu-common.h
include/qemu/main-loop.h
include/qemu/sockets.h
include/qom/cpu.h
include/qom/object.h
include/standard-headers/linux/virtio_ring.h
linux-user/elfload.c
linux-user/main.c
linux-user/mmap.c
linux-user/signal.c
linux-user/syscall.c
memory.c
monitor.c
net/tap-win32.c
pc-bios/README
qemu-char.c
qemu-img.c
qemu-io.c
qemu-options.hx
qobject/json-parser.c
qom/object.c
target-arm/arm-semi.c
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.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/svm_helper.c
target-i386/translate.c
target-m68k/op_helper.c
target-m68k/translate.c
target-microblaze/op_helper.c
target-mips/cpu.h
target-mips/op_helper.c
target-ppc/translate.c
target-ppc/translate_init.c
target-sh4/helper.c
target-sh4/op_helper.c
target-sh4/translate.c
target-sparc/translate.c
tcg/i386/tcg-target.c
tcg/tcg.c
tcg/tcg.h
tests/Makefile
thunk.c
translate-all.c
ui/console.c
ui/vnc.c
ui/vnc.h
user-exec.c
util/cutils.c
util/qemu-option.c
vl.c