Merge tag 'media/v4.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab...
authorLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2016 13:59:37 +0000 (09:59 -0400)
committerLinus Torvalds <torvalds@linux-foundation.org>
Thu, 4 Aug 2016 13:59:37 +0000 (09:59 -0400)
commitc1ece76719205690f4b448460d9b85c130e8021b
tree01072c593d53ef551788228ea28ce8bc87bc0e45
parentfb1b83d3ff78168e10799627f231cf0c05c9d80d
parent292eaf50c7df4ae2ae8aaa9e1ce3f1240a353ee8
Merge tag 'media/v4.8-5' of git://git./linux/kernel/git/mchehab/linux-media

Pull media DocBook removal and some fixups from Mauro Carvalho Chehab:

  - removal of the media DocBook (since it's all in Sphinx now)

  - videobuf2: Fix an allocation regression

  - a few fixes related to the CEC drivers

* tag 'media/v4.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media:
  [media] cec: fix off-by-one memset
  [media] staging: add MEDIA_SUPPORT dependency
  [media] vivid: don't handle CEC_MSG_SET_STREAM_PATH
  [media] media: adv7180: Fix broken interrupt register access
  [media] vb2: Fix allocation size of dma_parms
  [media] vim2m: copy the other colorspace-related fields as well
  [media] adv7511: fix VIC autodetect
  doc-rst: Remove the media docbook
Documentation/DocBook/Makefile
Makefile
drivers/media/v4l2-core/videobuf2-dma-contig.c