Merge tag 'vfio-v4.0-rc4' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Mar 2015 16:36:10 +0000 (09:36 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 14 Mar 2015 16:36:10 +0000 (09:36 -0700)
commit0be952c13be80ccdd3cb0d1ba25099de9468ac1b
treec8c02d5240d1ef3b76f3bc9d58ed275a0e8634f5
parent9c987a33a864cf405e4c22104508a26197310fd0
parentec76f4007079469e86e2e44c3e5d1d11086de9d6
Merge tag 'vfio-v4.0-rc4' of git://github.com/awilliam/linux-vfio

Pull VFIO fix from Alex Williamson:
 "Add missing break to avoid clobbering ioctl (Alexey Kardashevskiy)"

* tag 'vfio-v4.0-rc4' of git://github.com/awilliam/linux-vfio:
  vfio-pci: Add missing break to enable VFIO_PCI_ERR_IRQ_INDEX