Merge remote-tracking branch 'iommu/next'

diff --cc arch/arm/mach-omap2/devices.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_3xxx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/omap_hwmod_44xx_data.c
Simple merge

diff --cc drivers/media/platform/omap3isp/isp.c
Simple merge

diff --cc drivers/media/platform/omap3isp/isp.h
Simple merge

diff --cc drivers/media/platform/omap3isp/ispccdc.c
Simple merge

diff --cc drivers/media/platform/omap3isp/ispstat.c
Simple merge

diff --cc drivers/media/platform/omap3isp/ispvideo.c
Simple merge