Merge remote-tracking branch 'qemu/master'
commitf4c3b0bc5f236fe405894f26c8fff9fd51f39c8c
authorStefan Weil <sw@weilnetz.de>
Fri, 29 Jul 2016 20:10:10 +0000 (29 22:10 +0200)
committerStefan Weil <sw@weilnetz.de>
Fri, 29 Jul 2016 20:10:10 +0000 (29 22:10 +0200)
tree69762427c34e9659f2d90a5c4489b997271a1f46
parent07085e59200de54e86eb2073f844c4992204d439
parent69d490079f82f5ffe31fff426aaa580d5fec5fb7
Merge remote-tracking branch 'qemu/master'
12 files changed:
bsd-user/qemu.h
configure
exec.c
hw/mips/mips_malta.c
hw/pci/pci.c
include/exec/exec-all.h
include/qom/cpu.h
linux-user/qemu.h
qemu-char.c
rules.mak
target-mips/helper.c
vl.c