commit 319720f534d88039615bceb88d4bc094a7cd4ce9
author Linus Torvalds <torvalds@linux-foundation.org> Thu Dec 12 10:20:58 2013 -0800
committer Linus Torvalds <torvalds@linux-foundation.org> Thu Dec 12 10:20:58 2013 -0800
tree 85f6a53e2926de546f02c3f60acf7303984121b7
parent 5dec682c7f33a765a5eb764cc18b1d02b17cd762
parent 239a87020b263fe7e70adc5803cb157955023d3c

Merge tag 'iommu-fixes-for-v3.13-rc4' of git://github.com/awilliam/linux-vfio

Pull iommu fixes from Alex Williamson:
 "arm/smmu driver updates via Will Deacon fixing locking around page
  table walks and a couple other issues"

* tag 'iommu-fixes-for-v3.13-rc4' of git://github.com/awilliam/linux-vfio:
  iommu/arm-smmu: fix error return code in arm_smmu_device_dt_probe()
  iommu/arm-smmu: remove potential NULL dereference on mapping path
  iommu/arm-smmu: use mutex instead of spinlock for locking page tables