Merge remote-tracking branch 'qemu/master'
commit7ab370317de5afd7bcb9e07c451f854c4fa6d7ac
authorStefan Weil <sw@weilnetz.de>
Sat, 11 Oct 2014 07:53:16 +0000 (11 09:53 +0200)
committerStefan Weil <sw@weilnetz.de>
Sat, 11 Oct 2014 07:53:16 +0000 (11 09:53 +0200)
tree788ac3220e10d3694614ae6f85e8664c501105eb
parent8aac025b308ea1b9a59571934454802facacdb2b
parentb00a0ddb31a393b8386d30a9bef4d9bbb249e7ec
Merge remote-tracking branch 'qemu/master'

Conflicts:
cpu-exec.c
hw/display/vga-helpers.h
hw/display/vga.c
target-m68k/op_helper.c

Signed-off-by: Stefan Weil <sw@weilnetz.de>
31 files changed:
Makefile
configure
cpu-exec.c
cpus.c
docs/tracing.txt
hw/char/serial.c
hw/display/vga-helpers.h
hw/display/vga.c
include/qom/cpu.h
monitor.c
po/Makefile
qemu-img.c
target-arm/cpu.c
target-arm/cpu.h
target-arm/helper.c
target-arm/op_helper.c
target-arm/translate.c
target-i386/cpu.c
target-i386/cpu.h
target-i386/seg_helper.c
target-m68k/op_helper.c
target-mips/helper.c
target-ppc/excp_helper.c
target-ppc/translate_init.c
target-sh4/helper.c
tcg/tcg.h
tests/Makefile
trace-events
ui/console.c
util/qemu-option.c
vl.c