tree 71675bb21740df9650581cc26a500e6f625e3e53
parent da124e62de2109a312e21d85d6a3419774c58948
parent d9f0e63898d639629bb7eb914786529185334635
author Anthony Liguori <aliguori@us.ibm.com> 1350935303 -0500
committer Anthony Liguori <aliguori@us.ibm.com> 1350935303 -0500

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