From: Anthony Liguori Date: Mon, 10 Jun 2013 16:37:47 +0000 (-0500) Subject: Merge remote-tracking branch 'luiz/queue/qmp' into staging X-Git-Tag: qemu-xen-4.4.0-rc1~6^2~316 X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=b62cd318daaa3d94c150d87dc2c8466b9463cef5;p=qemu-upstream-4.6-testing.git Merge remote-tracking branch 'luiz/queue/qmp' into staging # By Luiz Capitulino (2) and Marcelo Tosatti (1) # Via Luiz Capitulino * luiz/queue/qmp: correct RTC_CHANGE_EVENT description (v2) MAINTAINERS: split Monitor (QMP/HMP) entry MAINTAINERS: new maintainers for qapi-schema.json Message-id: 1370634855-18337-1-git-send-email-lcapitulino@redhat.com Signed-off-by: Anthony Liguori --- b62cd318daaa3d94c150d87dc2c8466b9463cef5