Merge branch 'origin'

Conflicts:
	Documentation/video4linux/CARDLIST.cx88
	drivers/media/video/cx88/Kconfig
	drivers/media/video/em28xx/em28xx-video.c
	drivers/media/video/saa7134/saa7134-dvb.c

Resolved as in the original merge by Mauro Carvalho Chehab

diff --cc drivers/media/dvb/dvb-usb/vp7045.c
Simple merge

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

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

diff --cc include/linux/dvb/video.h
Simple merge

diff --cc include/linux/videodev2.h
Simple merge