From: Peter Maydell <peter.maydell@linaro.org>
Date: Wed, 10 Jun 2015 14:46:39 +0000 (+0100)
Subject: Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150609.0' into... 
X-Git-Tag: qemu-xen-4.7.0-rc1~263
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=eed8a8f572e659c85f8711d79c20da95021e06e2;p=qemu-xen.git

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

Initial VFIO platform device support, v2 (Eric Auger, et al.)

# gpg: Signature made Tue Jun  9 15:25:40 2015 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-20150609.0:
  hw/vfio/platform: calxeda xgmac device
  hw/vfio/platform: add irq assignment
  hw/vfio/platform: vfio-platform skeleton

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

eed8a8f572e659c85f8711d79c20da95021e06e2