Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150925.0' into...
commit8bfbbb4bcb6e06aaf4a3e2264f53c8c44ed4c655
authorPeter Maydell <peter.maydell@linaro.org>
Fri, 25 Sep 2015 20:11:12 +0000 (25 21:11 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Fri, 25 Sep 2015 20:11:12 +0000 (25 21:11 +0100)
treeb34daa67206bd40e4a8bdaf30acf9b06abfae4c0
parent54b376230c795d9f63490fa2e951cb786f7b1e12
parent9d146b2e2fbc1c2e42be1e3ee6c0d507ea79f0f9
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>