From: Anthony Liguori Date: Fri, 31 May 2013 16:32:32 +0000 (-0500) Subject: Merge remote-tracking branch 'luiz/queue/qmp' into staging X-Git-Tag: v1.6.0-rc0~264 X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6c8df7a33ade90c8c96b01655520c7e9b69b46c0;p=thirdparty%2Fqemu.git Merge remote-tracking branch 'luiz/queue/qmp' into staging # By Luiz Capitulino (1) and others # Via Luiz Capitulino * luiz/queue/qmp: target-i386: Fix mask of pte index in memory mapping target-i386: fix abort on bad PML4E/PDPTE/PDE/PTE addresses qapi: pad GenericList value fields to 64 bits Message-id: 1370009905-4255-1-git-send-email-lcapitulino@redhat.com Signed-off-by: Anthony Liguori --- 6c8df7a33ade90c8c96b01655520c7e9b69b46c0