git.openpandora.org / pandora-kernel.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | combined (merge: 5c85121 3be3a07)
Merge tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Jan 2014 01:42:31 +0000 (17:42 -0800)
committerLinus Torvalds <torvalds@linux-foundation.org>
Sat, 25 Jan 2014 01:42:31 +0000 (17:42 -0800)
Pull vfio update from Alex Williamson:
 - convert to misc driver to support module auto loading
 - remove unnecessary and dangerous use of device_lock

* tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio:
  vfio-pci: Don't use device_lock around AER interrupt setup
  vfio: Convert control interface to misc driver
  misc: Reserve minor for VFIO

1  2 
drivers/vfio/pci/vfio_pci.c patch | diff1 | diff2 | blob | history

diff --cc drivers/vfio/pci/vfio_pci.c
Simple merge
Pandora Kernel Repository