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)
commit7358cf2073e1abcfb85bb2829f73b2a12b909de6
tree2f912ba63d1b0156a88f7cc725e8f775412e9600
parent2ff9870c4cccf97d777bf5551d22303e0176b201
parent6499f0a8b3f44141431df79923fb8f1d8017e139
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