Merge branch 'msm-core' into for-next
authorDavid Brown <davidb@codeaurora.org>
Mon, 14 Feb 2011 21:43:54 +0000 (13:43 -0800)
committerDavid Brown <davidb@codeaurora.org>
Mon, 14 Feb 2011 21:43:54 +0000 (13:43 -0800)
* 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


Trivial merge