Merge remote-tracking branch 'qemu/master'
commitc57c9b068cee28a78823bc19611bc5cb23a2ea22
authorStefan Weil <sw@weilnetz.de>
Wed, 2 Mar 2016 21:34:39 +0000 (2 22:34 +0100)
committerStefan Weil <sw@weilnetz.de>
Wed, 2 Mar 2016 21:34:39 +0000 (2 22:34 +0100)
treee6b86cfcc98ff0de1ec23773f21869910d0a7dc4
parent38abeb12a9743e8e4bc5f2716fae17dd3f40d129
parented6128ebbdd7cd885d39980659dad4b5c8ae8158
Merge remote-tracking branch 'qemu/master'
18 files changed:
MAINTAINERS
block/vhdx.c
docs/tracing.txt
hw/input/ps2.c
hw/ppc/spapr.c
include/qom/cpu.h
memory.c
migration/savevm.c
monitor.c
qemu-options.hx
target-arm/translate.c
target-cris/translate.c
target-i386/translate.c
target-m68k/translate.c
tcg/tcg.h
ui/console.c
ui/vnc.c
vl.c