projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 9c987a3 ec76f40)
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)
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


Trivial merge
Motorola kernel-slsi