]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: da124e6 d9f0e63)
Merge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-20121017.0' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Mon, 22 Oct 2012 19:48:23 +0000 (14:48 -0500)
committerAnthony Liguori <aliguori@us.ibm.com>
Mon, 22 Oct 2012 19:48:23 +0000 (14:48 -0500)
* awilliam/tags/vfio-pci-for-qemu-20121017.0:
  vfio-pci: Mark non-migratable
  vfio-pci: Fix debug build

1  2 
hw/vfio_pci.c patch | diff1 | diff2 | blob | history

diff --cc hw/vfio_pci.c
Simple merge
Qemu copy for testing