From: Peter Maydell <peter.maydell@linaro.org>
Date: Fri, 25 Sep 2015 20:11:12 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150925.0' into... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=8bfbbb4bcb6e06aaf4a3e2264f53c8c44ed4c655;p=qemu.git

Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150925.0' into staging

VFIO updates 2015-09-25

 - Remove use of g_malloc0_n for glib2.22 compat

# gpg: Signature made Fri 25 Sep 2015 17:58:04 BST using RSA key ID 3BB08B22
# gpg: Good signature from "Alex Williamson <alex.williamson@redhat.com>"
# gpg:                 aka "Alex Williamson <alex@shazbot.org>"
# gpg:                 aka "Alex Williamson <alwillia@redhat.com>"
# gpg:                 aka "Alex Williamson <alex.l.williamson@gmail.com>"

* remotes/awilliam/tags/vfio-update-20150925.0:
  vfio/pci: Remove use of g_malloc0_n() from quirks

Signed-off-by: Peter Maydell <peter.maydell@linaro.org>
---

8bfbbb4bcb6e06aaf4a3e2264f53c8c44ed4c655