Merge remote-tracking branch 'remotes/awilliam/tags/vfio-update-20150609.0' into...
authorPeter Maydell <peter.maydell@linaro.org>
Wed, 10 Jun 2015 14:46:39 +0000 (15:46 +0100)
committerPeter Maydell <peter.maydell@linaro.org>
Wed, 10 Jun 2015 14:46:39 +0000 (15:46 +0100)
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>

Trivial merge