iommu and shit.

Conflicts:
	arch/arm/mach-msm/board-m7-display.c
	arch/arm/mach-msm/clock-8960.c
	arch/arm/mach-msm/devices-8064.c
	arch/arm/mach-msm/devices-iommu.c
	arch/arm/mach-msm/include/mach/board.h
	arch/arm/mach-msm/include/mach/iommu.h
	arch/arm/mach-msm/include/mach/iommu_domains.h
	arch/arm/mach-msm/iommu_domains.c
	arch/arm/mach-msm/subsystem_map.c
	drivers/gpu/ion/Makefile
	drivers/gpu/ion/ion.c
	drivers/gpu/ion/ion_carveout_heap.c
	drivers/gpu/ion/ion_cma_heap.c
	drivers/gpu/ion/ion_cp_heap.c
	drivers/gpu/ion/ion_heap.c
	drivers/gpu/ion/ion_iommu_heap.c
	drivers/gpu/ion/ion_priv.h
	drivers/gpu/ion/ion_system_heap.c
	drivers/gpu/ion/msm/ion_cp_common.c
	drivers/gpu/ion/msm/msm_ion.c
	drivers/gpu/msm/kgsl_mmu.c
	drivers/iommu/iommu.c
	drivers/iommu/msm_iommu-v2.c
	drivers/iommu/msm_iommu.c
	drivers/iommu/msm_iommu_dev-v2.c
	drivers/iommu/msm_iommu_dev.c
	drivers/iommu/msm_iommu_pagetable.c
	drivers/iommu/msm_iommu_pagetable.h
	include/linux/iommu.h
	include/linux/ion.h
	include/linux/msm_ion.h
	include/media/msm/vcd_property.h
	include/media/msm/vidc_type.h
ion: ioctl compatibility with userland using old api

As far as I can tell, flags passed by userland are now used to determine
buffer caching.

Note in ION_IOC_ALLOC_COMPAT we are currently forcing uncached buffer
allocations (needed to make a choice here).  This
may need to change.

Conflicts:
	include/linux/ion.h
	include/linux/msm_ion.h
gpu: ion: enable the kmalloc heap

There are some Ion clients who would like to use the kmalloc
heap. Enable it.

Change-Id: Ie818be9e1211d52d489ad2cb63d94e2fddfc0f01
Signed-off-by: Mitchel Humpherys <mitchelh@codeaurora.org>