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

Conflicts:
	arch/arm/mach-davinci/include/mach/da8xx.h

diff --cc arch/arm/mach-davinci/da850.c
Simple merge

diff --cc arch/arm/mach-davinci/dm644x.c
Simple merge

diff --cc arch/arm/mach-davinci/include/mach/da8xx.h
index c9ee723c56f35a78628dc0a4a78c08bd63a4f6c3,13d229575757ffadcce3636068c03512d04fa948..aaccdc4528fcce2f3110d2d4385dc1c5239ceebb
--- 1/arch/arm/mach-davinci/include/mach/da8xx.h
--- 2/arch/arm/mach-davinci/include/mach/da8xx.h
+++ b/arch/arm/mach-davinci/include/mach/da8xx.h
@@@ -16,7 -16,7 +16,8 @@@
  #include <linux/platform_device.h>
  #include <linux/davinci_emac.h>
  #include <linux/spi/spi.h>
 +#include <linux/platform_data/davinci_asp.h>
+ #include <linux/videodev2.h>
  
  #include <mach/serial.h>
  #include <mach/edma.h>

diff --cc arch/arm/mach-exynos/mach-nuri.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-origen.c
Simple merge

diff --cc arch/arm/mach-exynos/mach-universal_c210.c
Simple merge

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

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

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