Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (57 commits) [media] as3645a: Fix compilation by including slab.h [media] s5p-fimc: Remove linux/version.h include from fimc-mdevice.c [media] s5p-mfc: Remove linux/version.h include from s5p_mfc.c [media] ds3000: using logical && instead of bitwise & [media] v4l2-ctrls: make control names consistent [media] DVB: dib0700, add support for Nova-TD LEDs [media] DVB: dib0700, add corrected Nova-TD frontend_attach [media] DVB: dib0700, separate stk7070pd initialization [media] DVB: dib0700, move Nova-TD Stick to a separate set [media] : add MODULE_FIRMWARE to dib0700 [media] DVB-CORE: remove superfluous DTV_CMDs [media] s5p-jpeg: adapt to recent videobuf2 changes [media] s5p-g2d: fixed a bug in controls setting function [media] s5p-mfc: Fix volatile controls setup [media] drivers/media/video/s5p-mfc/s5p_mfc.c: adjust double test [media] drivers/media/video/s5p-fimc/fimc-capture.c: adjust double test [media] s5p-fimc: Fix incorrect control ID assignment [media] dvb_frontend: Don't call get_frontend() if idle [media] DocBook/dvbproperty.xml: Remove DTV_MODULATION from ISDB-T [media] DocBook/dvbproperty.xml: Fix ISDB-T delivery system parameters ...
Showing
- Documentation/DocBook/media/dvb/dvbproperty.xml 5 additions, 7 deletionsDocumentation/DocBook/media/dvb/dvbproperty.xml
- Documentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml 13 additions, 5 deletionsDocumentation/DocBook/media/v4l/vidioc-g-ext-ctrls.xml
- Documentation/DocBook/media/v4l/vidioc-g-fbuf.xml 14 additions, 9 deletionsDocumentation/DocBook/media/v4l/vidioc-g-fbuf.xml
- Documentation/DocBook/media/v4l/vidioc-g-frequency.xml 5 additions, 2 deletionsDocumentation/DocBook/media/v4l/vidioc-g-frequency.xml
- Documentation/DocBook/media/v4l/vidioc-g-input.xml 2 additions, 2 deletionsDocumentation/DocBook/media/v4l/vidioc-g-input.xml
- Documentation/DocBook/media/v4l/vidioc-g-output.xml 3 additions, 2 deletionsDocumentation/DocBook/media/v4l/vidioc-g-output.xml
- Documentation/feature-removal-schedule.txt 0 additions, 11 deletionsDocumentation/feature-removal-schedule.txt
- Documentation/video4linux/v4l2-controls.txt 0 additions, 21 deletionsDocumentation/video4linux/v4l2-controls.txt
- drivers/media/common/tuners/tuner-xc2028.c 21 additions, 6 deletionsdrivers/media/common/tuners/tuner-xc2028.c
- drivers/media/common/tuners/xc4000.c 86 additions, 0 deletionsdrivers/media/common/tuners/xc4000.c
- drivers/media/dvb/dvb-core/dvb_frontend.c 20 additions, 21 deletionsdrivers/media/dvb/dvb-core/dvb_frontend.c
- drivers/media/dvb/dvb-usb/anysee.c 7 additions, 13 deletionsdrivers/media/dvb/dvb-usb/anysee.c
- drivers/media/dvb/dvb-usb/dib0700.h 2 additions, 0 deletionsdrivers/media/dvb/dvb-usb/dib0700.h
- drivers/media/dvb/dvb-usb/dib0700_core.c 1 addition, 0 deletionsdrivers/media/dvb/dvb-usb/dib0700_core.c
- drivers/media/dvb/dvb-usb/dib0700_devices.c 137 additions, 13 deletionsdrivers/media/dvb/dvb-usb/dib0700_devices.c
- drivers/media/dvb/frontends/cxd2820r_core.c 8 additions, 2 deletionsdrivers/media/dvb/frontends/cxd2820r_core.c
- drivers/media/dvb/frontends/ds3000.c 1 addition, 1 deletiondrivers/media/dvb/frontends/ds3000.c
- drivers/media/dvb/frontends/mb86a20s.c 4 additions, 4 deletionsdrivers/media/dvb/frontends/mb86a20s.c
- drivers/media/dvb/frontends/tda18271c2dd.c 0 additions, 1 deletiondrivers/media/dvb/frontends/tda18271c2dd.c
- drivers/media/video/as3645a.c 1 addition, 0 deletionsdrivers/media/video/as3645a.c
Loading
Please register or sign in to comment