diff options
| author | Olof Johansson <olof@lixom.net> | 2012-12-01 06:40:59 +0100 |
|---|---|---|
| committer | Olof Johansson <olof@lixom.net> | 2012-12-01 06:40:59 +0100 |
| commit | 8556650dd3370a927217f16444aac5cc0c71e61b (patch) | |
| tree | a392b07b5d72a6522d3d5f1561b8fe2b64ca8021 /arch/arm/mach-imx/mx31lilly-db.c | |
| parent | Merge tag 'at91-header' of git://github.com/at91linux/linux-at91 into next/he... (diff) | |
| parent | ARM: OMAP2+: Move iommu/iovmm headers to platform_data (diff) | |
| download | linux-8556650dd3370a927217f16444aac5cc0c71e61b.tar.xz linux-8556650dd3370a927217f16444aac5cc0c71e61b.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/headers
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 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-imx/mx31lilly-db.c')
0 files changed, 0 insertions, 0 deletions