]> git.proxmox.com Git - qemu.git/commitdiff
projects / qemu.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 662d263 a771c51)
Merge remote-tracking branch 'awilliam/tags/vfio-pci-for-qemu-1.3.0-rc0' into staging
authorAnthony Liguori <aliguori@us.ibm.com>
Wed, 14 Nov 2012 14:53:40 +0000 (08:53 -0600)
committerAnthony Liguori <aliguori@us.ibm.com>
Wed, 14 Nov 2012 14:53:40 +0000 (08:53 -0600)
vfio-pci: KVM INTx accel & common msi_get_message

* awilliam/tags/vfio-pci-for-qemu-1.3.0-rc0:
  vfio-pci: Use common msi_get_message
  vfio-pci: Add KVM INTx acceleration
  linux-headers: Update to 3.7-rc5

Signed-off-by: Anthony Liguori <aliguori@us.ibm.com>

Trivial merge
Qemu copy for testing