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)
commit2d08cd0ef89a24f5eb6c6801c48cd06bca230d6d
treed9bbec83fa54dd5338144089b6dcb570a40237e7
parent5c85121bf618aece49155f6eea0d0b2c14c1a121
parent3be3a074cf5ba641529d8fdae0e05ca642f23e12
Merge tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio

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
drivers/vfio/pci/vfio_pci.c