Merge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-20121017.0' into staging
commit248bbe74930472e7653dd88716188ab0329f4604
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 22 Oct 2012 19:48:23 +0000 (22 14:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 22 Oct 2012 19:48:23 +0000 (22 14:48 -0500)
tree71675bb21740df9650581cc26a500e6f625e3e53
parentda124e62de2109a312e21d85d6a3419774c58948
parentd9f0e63898d639629bb7eb914786529185334635
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
hw/vfio_pci.c