Merge branch 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mcheha...

* 'v4l_for_2.6.35' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: (243 commits)
  V4L/DVB: sms: Convert IR support to use the Remote Controller core
  V4L/DVB: sms: properly initialize IR phys and IR name
  V4L/DVB: standardize names at rc-dib0700 tables
  V4L/DVB: smsusb: enable IR port for Hauppauge WinTV MiniStick
  V4L/DVB: dib0700: Fix RC protocol logic to properly handle NEC/NECx and RC-5
  V4L/DVB: dib0700: properly implement IR change_protocol
  V4L/DVB: dib0700: break keytable into NEC and RC-5 variants
  V4L/DVB: dib0700: avoid bad repeat
  V4L/DVB: Port dib0700 to rc-core
  V4L/DVB: Add a keymap file with dib0700 table
  V4L/DVB: dvb-usb: add support for rc-core mode
  V4L/DVB: dvb-usb: prepare drivers for using rc-core
  V4L/DVB: dvb-usb: get rid of struct dvb_usb_rc_key
  V4L/DVB: rj54n1cb0c: fix a comment in the driver
  V4L/DVB: V4L2: sh_vou: VOU does support the full PAL resolution too
  V4L/DVB: V4L2: sh_mobile_camera_ceu: add support for CSI2
  V4L/DVB: V4L2: soc-camera: add a MIPI CSI-2 driver for SH-Mobile platforms
  V4L/DVB: V4L2: soc-camera: export soc-camera bus type for notifications
  V4L/DVB: V4L2: mediabus: add 12-bit Bayer and YUV420 pixel formats
  V4L/DVB: mediabus: fix ambiguous pixel code names
  ...

diff --cc drivers/media/video/Kconfig
Simple merge

diff --cc drivers/media/video/Makefile
index b08bd2b,8847863..1051ecc
--- 1/drivers/media/video/Makefile
--- 2/drivers/media/video/Makefile
+++ b/drivers/media/video/Makefile
@@@ -162,9 -158,9 +158,10 @@@ obj-$(CONFIG_SOC_CAMERA)          += soc_camera
  obj-$(CONFIG_SOC_CAMERA_PLATFORM)     += soc_camera_platform.o
  # soc-camera host drivers have to be linked after camera drivers
  obj-$(CONFIG_VIDEO_MX1)                       += mx1_camera.o
 +obj-$(CONFIG_VIDEO_MX2)                       += mx2_camera.o
  obj-$(CONFIG_VIDEO_MX3)                       += mx3_camera.o
  obj-$(CONFIG_VIDEO_PXA27x)            += pxa_camera.o
+ obj-$(CONFIG_VIDEO_SH_MOBILE_CSI2)    += sh_mobile_csi2.o
  obj-$(CONFIG_VIDEO_SH_MOBILE_CEU)     += sh_mobile_ceu_camera.o
  
  obj-$(CONFIG_ARCH_DAVINCI)            += davinci/