From: Anthony Liguori Date: Mon, 5 Aug 2013 13:01:32 +0000 (-0500) Subject: Merge remote-tracking branch 'mjt/trivial-patches' into staging X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=f5e7dad8ee5673b4de1eaa9a2fa610f0940f26b0;p=qemu.git Merge remote-tracking branch 'mjt/trivial-patches' into staging # By Fam Zheng (1) and others # Via Michael Tokarev * mjt/trivial-patches: vmdk: fix comment for vmdk_co_write_zeroes memory.c: drop kvm.h dependency block/iscsi.c: Fix printf format error. qemu-ga: build it even if !system Message-id: 1375453248-7178-1-git-send-email-mjt@msgid.tls.msk.ru Signed-off-by: Anthony Liguori --- f5e7dad8ee5673b4de1eaa9a2fa610f0940f26b0