Merge remote-tracking branch 'qemu/master'
commita9301c8a12fc834114bc6f41f9a3c47e3c2506ef
authorStefan Weil <sw@weilnetz.de>
Thu, 12 Mar 2015 19:54:31 +0000 (12 20:54 +0100)
committerStefan Weil <sw@weilnetz.de>
Thu, 12 Mar 2015 19:54:31 +0000 (12 20:54 +0100)
tree71292a663534efda35e5b71d97018719226d408d
parent3ca21eeba997e6126b236e9f31d0d85c9144880c
parent3d30395f7fb3315e4ecf0de4e48790e1326bbd47
Merge remote-tracking branch 'qemu/master'

Conflicts:
default-configs/mips-softmmu.mak
default-configs/mipsel-softmmu.mak
hw/input/ps2.c
tcg/tcg.c
tcg/tcg.h

Signed-off-by: Stefan Weil <sw@weilnetz.de>
64 files changed:
MAINTAINERS
Makefile.target
block/Makefile.objs
block/raw-win32.c
block/vhdx.c
configure
cpu-exec.c
cpus.c
default-configs/arm-softmmu.mak
default-configs/mips-softmmu.mak
default-configs/mipsel-softmmu.mak
default-configs/pci.mak
disas/libvixl/a64/constants-a64.h
exec.c
hw/arm/armv7m.c
hw/arm/boot.c
hw/char/serial.c
hw/display/vga.c
hw/display/xenfb.c
hw/input/ps2.c
hw/mips/gt64xxx_pci.c
hw/mips/mips_r4k.c
hw/misc/Makefile.objs
hw/pci/pci.c
hw/ppc/spapr.c
hw/usb/Makefile.objs
include/block/block_int.h
include/exec/cpu-all.h
include/exec/exec-all.h
include/hw/arm/arm.h
include/qemu/sockets.h
include/qom/cpu.h
include/sysemu/os-win32.h
linux-user/main.c
linux-user/signal.c
linux-user/syscall.c
memory.c
monitor.c
qemu-img.c
qemu-io.c
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-i386/kvm.c
target-i386/translate.c
target-m68k/translate.c
target-mips/machine.c
target-mips/op_helper.c
target-ppc/translate.c
target-sh4/translate.c
target-sparc/translate.c
tcg/tcg.c
tcg/tcg.h
tests/Makefile
tests/qemu-iotests/common.rc
translate-all.c
ui/vnc.c
util/qemu-option.c
vl.c