From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 20 Apr 2014 17:33:49 +0000 (-0700)
Subject: Merge tag 'iommu-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: MMI-PSA29.97-13-9~12320
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=5269519f9f05888bf52c4b71ed84d37c03c8aadb;p=GitHub%2FMotorolaMobilityLLC%2Fkernel-slsi.git

Merge tag 'iommu-fixes-v3.15-rc1' of git://git./linux/kernel/git/joro/iommu

Pull iommu fixes from Joerg Roedel:
 "Fixes for regressions:

   - fix wrong IOMMU enumeration causing some SCSI device drivers
     initialization failures
   - ARM-SMMU fixes for a panic condition and a wrong return value"

* tag 'iommu-fixes-v3.15-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/arm-smmu: fix panic in arm_smmu_alloc_init_pte
  iommu/arm-smmu: Return 0 on unmap failure
  iommu/vt-d: fix bug in matching PCI devices with DRHD/RMRR descriptors
  iommu/vt-d: Fix get_domain_for_dev() handling of upstream PCIe bridges
  iommu/vt-d: fix memory leakage caused by commit ea8ea46
---

5269519f9f05888bf52c4b71ed84d37c03c8aadb