Merge remote-tracking branch 'qemu/master'
commit0ca59a4a57e8084e50418c633246321b44424cd7
authorStefan Weil <sw@weilnetz.de>
Thu, 12 Jun 2014 05:15:49 +0000 (12 07:15 +0200)
committerStefan Weil <sw@weilnetz.de>
Thu, 12 Jun 2014 05:15:49 +0000 (12 07:15 +0200)
treec02cbdf1154ee02c65ce1a0fba88ae3dd53b0ffa
parent9647f54f2c107ab0cad81a38cdbe358d00d19b3b
parent05fedeef835c3c889e5d2e44f8abb11dcfcadefc
Merge remote-tracking branch 'qemu/master'
monitor.c
qemu-char.c
qobject/json-parser.c
util/readline.c