Merge remote-tracking branch 'iommu/next'

diff --cc drivers/media/video/Kconfig
index aed5b3d740ca0160f7ae500e52f60ca754cf7388,620106937ec6e51b56b0028f30ac6588d87b5c09..75e43c05aeeaea5a30a1cf5fe029914bd2654dde
--- 1/drivers/media/video/Kconfig
--- 2/drivers/media/video/Kconfig
+++ b/drivers/media/video/Kconfig
@@@ -775,10 -753,17 +775,9 @@@ config VIDEO_VIA_CAMER
           Chrome9 chipsets.  Currently only tested on OLPC xo-1.5 systems
           with ov7670 sensors.
  
 -config VIDEO_NOON010PC30
 -      tristate "NOON010PC30 CIF camera sensor support"
 -      depends on I2C && VIDEO_V4L2
 -      ---help---
 -        This driver supports NOON010PC30 CIF camera from Siliconfile
 -
 -source "drivers/media/video/m5mols/Kconfig"
 -
  config VIDEO_OMAP3
        tristate "OMAP 3 Camera support (EXPERIMENTAL)"
-       select OMAP_IOMMU
-       depends on VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
+       depends on OMAP_IOVMM && VIDEO_V4L2 && I2C && VIDEO_V4L2_SUBDEV_API && ARCH_OMAP3 && EXPERIMENTAL
        ---help---
          Driver for an OMAP 3 camera controller.
  

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

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

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

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