Merge remote-tracking branch 'mjt/trivial-patches' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Aug 2013 13:01:32 +0000 (08:01 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 5 Aug 2013 13:01:32 +0000 (08:01 -0500)
# 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 <aliguori@us.ibm.com>

Trivial merge