Merge remote-tracking branch 'qemu/master'
commit69b7b57252f7e6fdce147f41c1311474a3b951af
authorStefan Weil <sw@weilnetz.de>
Tue, 24 Jan 2017 06:40:20 +0000 (24 07:40 +0100)
committerStefan Weil <sw@weilnetz.de>
Tue, 24 Jan 2017 06:40:20 +0000 (24 07:40 +0100)
tree794d16abe1d2d2fc1cf0e1b0a3d8d35b05ecaf86
parenteca1ddcf801b16256f5c07803e12571cafaf1b0b
parent3879284d6517dc22529395bdb259f4183b589127
Merge remote-tracking branch 'qemu/master'
qapi-schema.json
qemu-char.c