From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 25 Jan 2014 01:42:31 +0000 (-0800)
Subject: Merge tag 'vfio-v3.14-rc1' of git://github.com/awilliam/linux-vfio
X-Git-Tag: v3.14-rc1~100
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=2d08cd0ef89a24f5eb6c6801c48cd06bca230d6d;p=profile%2Fivi%2Fkernel-x86-ivi.git

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
---

2d08cd0ef89a24f5eb6c6801c48cd06bca230d6d