Olof Johansson 794b175fc0
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 >
2012-11-30 21:38:59 -08:00
2012-09-17 20:55:54 +01:00
2012-09-08 10:20:09 +01:00
2012-10-15 10:05:43 +08:00
2012-09-19 17:42:17 +02:00
2012-09-17 07:35:08 -04:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:18 +02:00
2012-09-19 17:42:18 +02:00
2012-10-09 07:07:14 +09:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:18 +02:00
2012-09-14 11:16:40 +02:00
2012-09-14 11:17:21 +02:00
2012-09-22 01:07:21 -07:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:18:10 +02:00
2012-08-24 17:42:10 -07:00
2012-09-06 15:58:04 -07:00
2012-09-14 11:19:00 +02:00
2012-09-06 08:20:33 +08:00
2012-09-14 11:16:40 +02:00
2012-09-14 11:16:55 +02:00
2012-09-14 11:17:21 +02:00
2012-10-15 10:03:17 +08:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:17 +02:00
2012-11-16 10:35:08 -06:00
2012-09-19 17:39:52 +02:00
2012-09-14 11:17:36 +02:00
2012-09-24 14:44:38 +08:00
2012-11-02 12:00:36 -07:00
2012-09-19 17:42:18 +02:00
2012-09-14 11:16:54 +02:00
2012-09-14 11:17:21 +02:00
2012-10-06 13:20:33 +02:00
2012-09-14 11:18:59 +02:00
2012-09-19 17:42:18 +02:00
2012-11-20 10:05:01 -08:00
2012-09-14 11:18:10 +02:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:19 +02:00
2012-09-14 11:16:55 +02:00
2012-09-14 11:19:00 +02:00
2012-09-19 17:39:52 +02:00
2012-09-14 11:18:10 +02:00
2012-09-14 11:18:59 +02:00
2012-09-14 11:16:54 +02:00
2012-09-19 17:39:52 +02:00
2012-09-19 17:42:17 +02:00
2012-09-19 17:42:17 +02:00
2012-09-11 18:32:43 +08:00
2012-09-13 11:56:41 +08:00
2012-10-17 12:03:18 -07:00
2012-09-24 19:12:29 +08:00
2012-09-19 17:42:18 +02:00
2012-10-06 03:04:53 +09:00
2012-10-06 03:04:53 +09:00
2012-10-06 03:04:52 +09:00
2012-09-20 18:07:23 -07:00
2012-09-23 21:08:33 -07:00
2012-08-16 12:12:25 -07:00
2012-09-14 11:18:57 +02:00
2012-10-05 22:35:16 -03:00
2012-09-14 11:16:54 +02:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:17:35 +02:00
2012-09-19 17:42:17 +02:00
2012-09-14 11:17:21 +02:00
2012-10-15 12:10:33 -07:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:18 +02:00
2012-09-14 11:18:57 +02:00
2012-09-14 08:14:07 +05:30
2012-09-14 11:18:10 +02:00
2012-09-14 11:16:54 +02:00
2012-09-14 11:16:54 +02:00
2012-09-14 11:17:21 +02:00
2012-10-15 14:42:10 +05:30
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:18 +02:00
2012-09-14 11:19:00 +02:00
2012-10-15 14:42:03 +05:30
2012-09-19 17:42:17 +02:00
2012-07-30 17:25:12 -07:00
2012-09-10 16:34:00 -07:00
2012-11-07 09:35:53 -08:00
2012-08-15 17:09:59 +01:00
2012-10-29 20:49:44 -06:00
2012-09-14 11:18:10 +02:00
2012-08-13 13:53:05 +02:00
2012-09-19 16:29:12 +08:00
2012-10-04 09:11:57 -07:00
2012-08-22 19:34:51 +01:00
2012-09-05 13:21:46 -07:00
2012-09-14 11:17:21 +02:00
2012-09-18 12:28:22 +02:00
2012-09-23 21:08:35 -07:00
2012-09-14 11:16:54 +02:00
2012-09-14 11:16:55 +02:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:18:59 +02:00
2012-09-19 17:39:52 +02:00
2012-09-19 17:42:18 +02:00
2012-09-19 17:42:18 +02:00
2012-09-14 11:16:54 +02:00
2012-09-14 11:17:21 +02:00
2012-09-19 17:42:17 +02:00
2012-09-19 17:42:18 +02:00
2012-09-19 17:42:18 +02:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:19:00 +02:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:18 +02:00
2012-10-24 14:26:55 -07:00
2012-09-14 11:18:10 +02:00
2012-09-19 17:42:18 +02:00
2012-09-14 11:16:55 +02:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:17:35 +02:00
2012-09-14 11:17:21 +02:00
2012-09-14 11:18:59 +02:00
2012-09-14 11:18:10 +02:00
2012-09-14 11:18:58 +02:00
2012-09-19 17:39:52 +02:00
794b175fc0