Merge remote-tracking branch 'v4l-dvb/master'

Conflicts:
	Documentation/feature-removal-schedule.txt
	arch/arm/mach-imx/mach-imx27_visstrim_m10.c
	arch/arm/mach-omap2/board-rx51-peripherals.c

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/mach-omap2/board-rx51-peripherals.c
index 3945c5017085abdb72cfd61532fb33c864df23c4,ca07264bd3ae7633d370e3ba9047988fd8153bf4..ed85fb898c7fd62b8526d0bf1e0bea1d23ff26fd
--- 1/arch/arm/mach-omap2/board-rx51-peripherals.c
--- 2/arch/arm/mach-omap2/board-rx51-peripherals.c
+++ b/arch/arm/mach-omap2/board-rx51-peripherals.c
@@@ -33,9 -30,13 +33,10 @@@
  #include "common.h"
  #include <plat/dma.h>
  #include <plat/gpmc.h>
 -#include <plat/onenand.h>
 -#include <plat/gpmc-smc91x.h>
+ #include <plat/omap-pm.h>
 +#include "gpmc-smc91x.h"
  
 -#include <mach/board-rx51.h>
 +#include "board-rx51.h"
  
  #include <sound/tlv320aic3x.h>
  #include <sound/tpa6130a2-plat.h>

diff --cc arch/arm/plat-mxc/include/mach/devices-common.h
Simple merge

diff --cc drivers/gpio/gpio-bt8xx.c
Simple merge

diff --cc drivers/media/dvb-core/dvb_net.c
Simple merge

diff --cc drivers/media/pci/bt8xx/bttv-driver.c
Simple merge

diff --cc drivers/media/pci/cx18/cx18-driver.c
Simple merge

diff --cc drivers/media/pci/cx23885/cx23885-input.c
Simple merge

diff --cc drivers/media/pci/cx88/cx88-mpeg.c
Simple merge

diff --cc drivers/media/pci/mantis/mantis_evm.c
Simple merge

diff --cc drivers/media/pci/mantis/mantis_uart.c
Simple merge

diff --cc drivers/media/pci/ngene/ngene-cards.c
Simple merge

diff --cc drivers/media/pci/saa7134/saa7134-core.c
Simple merge

diff --cc drivers/media/pci/saa7134/saa7134-empress.c
Simple merge

diff --cc drivers/media/platform/davinci/vpbe_venc.c
Simple merge

diff --cc drivers/media/platform/omap/omap_vout.c
Simple merge

diff --cc drivers/media/platform/omap24xxcam.c
Simple merge

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

diff --cc drivers/media/platform/s5p-fimc/mipi-csis.c
Simple merge

diff --cc drivers/media/platform/soc_camera/mx1_camera.c
Simple merge

diff --cc drivers/media/platform/soc_camera/mx2_camera.c
Simple merge

diff --cc drivers/media/platform/soc_camera/mx3_camera.c
Simple merge

diff --cc drivers/media/platform/soc_camera/pxa_camera.c
Simple merge

diff --cc drivers/media/usb/cx231xx/cx231xx-cards.c
Simple merge

diff --cc drivers/media/usb/em28xx/em28xx-cards.c
Simple merge

diff --cc drivers/media/usb/tm6000/tm6000-cards.c
Simple merge