From: Mauro Carvalho Chehab <m.chehab@samsung.com>
Date: Sun, 25 May 2014 13:22:20 +0000 (-0300)
Subject: Merge branch 'arm/omap' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu... 
X-Git-Tag: firefly_0821_release~176^2~3754^2~26
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=cdd8be29c1fe89fe4ec69f09c4dd33524039a248;p=firefly-linux-kernel-4.4.55.git

Merge branch 'arm/omap' of git://git./linux/kernel/git/joro/iommu into topic/omap3isp

* 'arm/omap' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu:
  iommu/omap: Fix map protection value handling
  iommu/omap: Remove comment about supporting single page mappings only
  iommu/omap: Fix 'no page for' debug message in flush_iotlb_page()
  iommu/omap: Move to_iommu definition from omap-iopgtable.h
  iommu/omap: Remove omap_iommu_domain_has_cap() function
  iommu/omap: Correct init value of iotlb_entry valid field
---

cdd8be29c1fe89fe4ec69f09c4dd33524039a248