diff options
author | David Brown <davidb@codeaurora.org> | 2011-02-15 00:43:54 +0300 |
---|---|---|
committer | David Brown <davidb@codeaurora.org> | 2011-02-15 00:43:54 +0300 |
commit | 7358cf2073e1abcfb85bb2829f73b2a12b909de6 (patch) | |
tree | 2f912ba63d1b0156a88f7cc725e8f775412e9600 /arch/arm/mach-iop13xx/iq81340mc.c | |
parent | 2ff9870c4cccf97d777bf5551d22303e0176b201 (diff) | |
parent | 6499f0a8b3f44141431df79923fb8f1d8017e139 (diff) | |
download | linux-7358cf2073e1abcfb85bb2829f73b2a12b909de6.tar.xz |
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
Diffstat (limited to 'arch/arm/mach-iop13xx/iq81340mc.c')
0 files changed, 0 insertions, 0 deletions