Merge tag 'vfio-v3.12-rc5' of git://github.com/awilliam/linux-vfio
authorLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Oct 2013 01:11:28 +0000 (18:11 -0700)
committerLinus Torvalds <torvalds@linux-foundation.org>
Tue, 15 Oct 2013 01:11:28 +0000 (18:11 -0700)
commit1e52db6908ca5aa8e035caeaf96e8de2567fd84d
tree70287d7068d7614029d3e07e0325b89e30654cf5
parented8ada393388ef7ccfcfb3a88d8718f7df4b3165
parentd93b3ac0edb85b1c1e8fe0a065c1e5045783e2f6
Merge tag 'vfio-v3.12-rc5' of git://github.com/awilliam/linux-vfio

Pull vfio fix from Alex Williamson:
 "Fix an incorrect break out of nested loop in iommu mapping code"

* tag 'vfio-v3.12-rc5' of git://github.com/awilliam/linux-vfio:
  VFIO: vfio_iommu_type1: fix bug caused by break in nested loop