diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-01 06:38:59 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-01 06:38:59 +0100 |
| commit | 794b175fc0c0c4844dbb7b137a73bbfd01f6c608 (patch) | |
| tree | 69b9394b5b09118f9877cd02838a7cd2d7c4f63c /arch/arm/mach-tegra/sleep.S | |
| parent | Merge branch 'next/cleanup-samsung-3' of git://git.kernel.org/pub/scm/linux/k... (diff) | |
| parent | ARM: OMAP2+: Move iommu/iovmm headers to platform_data (diff) | |
| download | linux-794b175fc0c0c4844dbb7b137a73bbfd01f6c608.tar.xz linux-794b175fc0c0c4844dbb7b137a73bbfd01f6c608.zip | |
Merge tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap into next/cleanup
From Tony Lindgren:
Move most of remaining omap iommu code to drivers/iommu.
This is needed for the multiplatform kernels as the plat
and mach headers cannot be included.
These changes were agreed to be merged via the arm-soc
tree by Joerg and Ohad as these will cause some merge
conflicts with the other related clean-up branches.
So omap-for-v3.8/cleanup-headers-iommu should be added
as one of the depends branches for arm-soc.
* tag 'omap-for-v3.8/cleanup-headers-iommu-signed' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap:
ARM: OMAP2+: Move iommu/iovmm headers to platform_data
ARM: OMAP2+: Make some definitions local
ARM: OMAP2+: Move iommu2 to drivers/iommu/omap-iommu2.c
ARM: OMAP2+: Move plat/iovmm.h to include/linux/omap-iommu.h
ARM: OMAP2+: Move iopgtable header to drivers/iommu/
ARM: OMAP: Merge iommu2.h into iommu.h
Conflicts due to surrounding changes fixed up in:
arch/arm/mach-omap2/omap_hwmod_44xx_data.c
drivers/media/platform/omap3isp/ispvideo.c
Signed-off-by: Olof Johansson <olof@lixom.net>
Diffstat (limited to 'arch/arm/mach-tegra/sleep.S')
0 files changed, 0 insertions, 0 deletions