Merge tag 'vfio-v3.19-rc4' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Jan 2015 20:23:03 +0000 (12:23 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 10 Jan 2015 20:23:03 +0000 (12:23 -0800)
commit4850d37d3a7c049f7dc3eb09d7ae4e5553ac521b
treece7ace12d6a876ec67e248b3a4db431242c8bb82
parentaff8ad59fee4b79f2986b1bccb942bed94fd43fa
parent7c2e211f3c95b91912a92a8c6736343690042e2e
Merge tag 'vfio-v3.19-rc4' of git://github.com/awilliam/linux-vfio

Pull VFIO fix from Alex Williamson:
 "Fix PCI header check in vfio_pci_probe() (Wei Yang)"

* tag 'vfio-v3.19-rc4' of git://github.com/awilliam/linux-vfio:
  vfio-pci: Fix the check on pci device type in vfio_pci_probe()