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

Conflicts:
	drivers/staging/Makefile

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

diff --cc drivers/media/video/cx25821/cx25821-alsa.c
Simple merge

diff --cc drivers/media/video/cx25821/cx25821-audio-upstream.c
Simple merge

diff --cc drivers/media/video/cx25821/cx25821-audio-upstream.h
Simple merge

diff --cc drivers/media/video/cx25821/cx25821-audio.h
Simple merge

diff --cc drivers/media/video/cx25821/cx25821-cards.c
Simple merge

diff --cc drivers/media/video/cx25821/cx25821-core.c
Simple merge

diff --cc drivers/media/video/cx25821/cx25821-gpio.c
Simple merge

diff --cc drivers/media/video/cx25821/cx25821-i2c.c
Simple merge

diff --cc drivers/media/video/cx25821/cx25821-video-upstream-ch2.c
Simple merge

diff --cc drivers/media/video/cx25821/cx25821-video-upstream-ch2.h
Simple merge

diff --cc drivers/media/video/cx25821/cx25821-video-upstream.c
Simple merge

diff --cc drivers/media/video/cx25821/cx25821-video-upstream.h
Simple merge

diff --cc drivers/media/video/cx25821/cx25821-video.c
Simple merge

diff --cc drivers/media/video/cx25821/cx25821-video.h
Simple merge

diff --cc drivers/media/video/cx25821/cx25821.h
Simple merge

diff --cc drivers/staging/Kconfig
Simple merge

diff --cc drivers/staging/Makefile
index 936b7c22e18e2eebff3232841688dba57c6e0142,c1a60ef315967cc378402457c2db59393d046025..a25f3f26c7ff5899d22aad952c11061b0307ceea
--- 1/drivers/staging/Makefile
--- 2/drivers/staging/Makefile
+++ b/drivers/staging/Makefile
@@@ -3,13 -3,9 +3,10 @@@
  # fix for build system bug...
  obj-$(CONFIG_STAGING)         += staging.o
  
 +obj-y                         += serial/
+ obj-y                         += media/
  obj-$(CONFIG_ET131X)          += et131x/
  obj-$(CONFIG_SLICOSS)         += slicoss/
- obj-$(CONFIG_VIDEO_GO7007)    += go7007/
- obj-$(CONFIG_VIDEO_CX25821)   += cx25821/
- obj-$(CONFIG_DVB_CXD2099)     += cxd2099/
- obj-$(CONFIG_LIRC_STAGING)    += lirc/
  obj-$(CONFIG_USBIP_CORE)      += usbip/
  obj-$(CONFIG_W35UND)          += winbond/
  obj-$(CONFIG_PRISM2_USB)      += wlan-ng/

diff --cc drivers/staging/media/cxd2099/Makefile
Simple merge

diff --cc drivers/staging/media/dt3155v4l/dt3155v4l.c
Simple merge

diff --cc drivers/staging/media/dt3155v4l/dt3155v4l.h
Simple merge

diff --cc drivers/staging/media/easycap/easycap.h
Simple merge

diff --cc drivers/staging/media/easycap/easycap_ioctl.c
Simple merge

diff --cc drivers/staging/media/easycap/easycap_main.c
Simple merge

diff --cc drivers/staging/media/easycap/easycap_sound.c
Simple merge

diff --cc drivers/staging/media/go7007/Makefile
Simple merge

diff --cc drivers/staging/media/go7007/wis-tw2804.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_imon.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_sasem.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_serial.c
Simple merge

diff --cc drivers/staging/media/lirc/lirc_sir.c
Simple merge