Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-2.6: [media] v1.88 DM04/QQBOX Move remote to use rc_core dvb-usb-remote [media] Add missing include guard to header file [media] Inlined functions should be static [media] Remove invalid parameter description [media] cpia2: fix warning about invalid trigraph sequence [media] s5p-csis: Add missing dependency on PLAT_S5P [media] gspca/kinect: wrap gspca_debug with GSPCA_DEBUG [media] fintek-cir: new driver for Fintek LPC SuperIO CIR function [media] uvcvideo: Connect video devices to media entities [media] uvcvideo: Register subdevices for each entity [media] uvcvideo: Register a v4l2_device [media] add V4L2-PIX-FMT-SRGGB12 & friends to docbook [media] Documentation/DocBook: Rename media fops xml files [media] Media DocBook: fix validation errors [media] wl12xx: g_volatile_ctrl fix: wrong field set [media] fix kconfig dependency warning for VIDEO_TIMBERDALE [media] dm1105: GPIO handling added, I2C on GPIO added, LNB control through GPIO reworked [media] Add support for M-5MOLS 8 Mega Pixel camera ISP
Showing
- Documentation/DocBook/dvb/dvbproperty.xml 4 additions, 1 deletionDocumentation/DocBook/dvb/dvbproperty.xml
- Documentation/DocBook/media-entities.tmpl 4 additions, 3 deletionsDocumentation/DocBook/media-entities.tmpl
- Documentation/DocBook/v4l/media-controller.xml 3 additions, 3 deletionsDocumentation/DocBook/v4l/media-controller.xml
- Documentation/DocBook/v4l/pixfmt.xml 1 addition, 0 deletionsDocumentation/DocBook/v4l/pixfmt.xml
- Documentation/DocBook/v4l/subdev-formats.xml 5 additions, 5 deletionsDocumentation/DocBook/v4l/subdev-formats.xml
- drivers/media/dvb/dm1105/dm1105.c 236 additions, 36 deletionsdrivers/media/dvb/dm1105/dm1105.c
- drivers/media/dvb/dvb-usb/lmedm04.c 43 additions, 64 deletionsdrivers/media/dvb/dvb-usb/lmedm04.c
- drivers/media/dvb/frontends/stb0899_algo.c 1 addition, 1 deletiondrivers/media/dvb/frontends/stb0899_algo.c
- drivers/media/dvb/frontends/tda8261.c 0 additions, 1 deletiondrivers/media/dvb/frontends/tda8261.c
- drivers/media/radio/radio-wl1273.c 1 addition, 1 deletiondrivers/media/radio/radio-wl1273.c
- drivers/media/radio/wl128x/fmdrv_v4l2.c 1 addition, 1 deletiondrivers/media/radio/wl128x/fmdrv_v4l2.c
- drivers/media/rc/Kconfig 12 additions, 0 deletionsdrivers/media/rc/Kconfig
- drivers/media/rc/Makefile 1 addition, 0 deletionsdrivers/media/rc/Makefile
- drivers/media/rc/fintek-cir.c 684 additions, 0 deletionsdrivers/media/rc/fintek-cir.c
- drivers/media/rc/fintek-cir.h 243 additions, 0 deletionsdrivers/media/rc/fintek-cir.h
- drivers/media/rc/keymaps/rc-lme2510.c 67 additions, 67 deletionsdrivers/media/rc/keymaps/rc-lme2510.c
- drivers/media/video/Kconfig 4 additions, 2 deletionsdrivers/media/video/Kconfig
- drivers/media/video/Makefile 1 addition, 0 deletionsdrivers/media/video/Makefile
- drivers/media/video/cpia2/cpia2_v4l.c 2 additions, 2 deletionsdrivers/media/video/cpia2/cpia2_v4l.c
- drivers/media/video/gspca/kinect.c 1 addition, 1 deletiondrivers/media/video/gspca/kinect.c
Loading
Please register or sign in to comment