Merge remote-tracking branch 'qemu/master'
commitf52a224cc14b34f0281741c41d0e5992754cfec4
authorStefan Weil <sw@weilnetz.de>
Tue, 15 Mar 2016 22:08:48 +0000 (15 23:08 +0100)
committerStefan Weil <sw@weilnetz.de>
Tue, 15 Mar 2016 22:08:48 +0000 (15 23:08 +0100)
tree84851ac41ac0c6b4010f0ad69dc1ae8113cfc3c6
parent093d8b33ac93f3310727463bd4c990785b9a78c4
parenta6cdb77f816961f929d7934643febd2852230135
Merge remote-tracking branch 'qemu/master'
MAINTAINERS
block/Makefile.objs
block/vhdx.c
hw/ppc/spapr.c
include/block/block_int.h
monitor.c
qemu-char.c
qemu-options.hx
slirp/if.c
target-i386/kvm.c
target-i386/translate.c