Skip to content
  • Linus Torvalds's avatar
    Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media · 4a7c1ff2
    Linus Torvalds authored
    * '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
      ...
    4a7c1ff2