From: Anthony Liguori <aliguori@us.ibm.com>
Date: Mon, 22 Oct 2012 19:48:23 +0000 (-0500)
Subject: Merge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-20121017.0' into staging
X-Git-Tag: v1.3.0-rc0~190
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=248bbe74930472e7653dd88716188ab0329f4604;p=thirdparty%2Fqemu.git

Merge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-20121017.0' into staging

* awilliam/tags/vfio-pci-for-qemu-20121017.0:
  vfio-pci: Mark non-migratable
  vfio-pci: Fix debug build
---

248bbe74930472e7653dd88716188ab0329f4604