From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 12 Dec 2013 18:20:58 +0000 (-0800)
Subject: Merge tag 'iommu-fixes-for-v3.13-rc4' of git://github.com/awilliam/linux-vfio
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=319720f534d88039615bceb88d4bc094a7cd4ce9;p=openwrt%2Fstaging%2Fblogic.git

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

319720f534d88039615bceb88d4bc094a7cd4ce9