From: David Brown Date: Mon, 14 Feb 2011 21:43:54 +0000 (-0800) Subject: Merge branch 'msm-core' into for-next X-Git-Tag: firefly_0821_release~7613^2~2161^2~18 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=7358cf2073e1abcfb85bb2829f73b2a12b909de6;p=firefly-linux-kernel-4.4.55.git Merge branch 'msm-core' into for-next * msm-core: msm: iommu: Enable IOMMU support for MSM8960 msm: iommu: Generalize platform data for multiple targets msm: iommu: Create a Kconfig item for the IOMMU driver --- 7358cf2073e1abcfb85bb2829f73b2a12b909de6