From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sat, 19 Jul 2014 06:36:13 +0000 (-1000)
Subject: Merge tag 'iommu-fixes-v3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Tag: v5.15~17600
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=0bae49b24c3142a623da47d841b4bbf08ea8ae0c;p=platform%2Fkernel%2Flinux-starfive.git

Merge tag 'iommu-fixes-v3.16-rc5' of git://git./linux/kernel/git/joro/iommu

Pull iommu fixes from Joerg Roedel:
 "A couple of fixes for the Freescale PAMU driver queued up:

   - fix PAMU window size check.
   - fix the device domain attach condition.
   - fix the error condition during iommu group"

* tag 'iommu-fixes-v3.16-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/fsl: Fix the error condition during iommu group
  iommu/fsl: Fix the device domain attach condition.
  iommu/fsl: Fix PAMU window size check.
---

0bae49b24c3142a623da47d841b4bbf08ea8ae0c