Merge branch 'iommu-for-tony' of git://github.com/ohadbc/omap-iommu into devel-fixes
Tony Lindgren [Mon, 4 Jul 2011 14:40:05 +0000 (07:40 -0700)]
1  2 
arch/arm/plat-omap/iovmm.c

Simple merge