From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Thu, 4 Aug 2016 13:59:37 +0000 (-0400)
Subject: Merge tag 'media/v4.8-5' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab... 
X-Git-Url: http://drtracing.org/?a=commitdiff_plain;h=c1ece76719205690f4b448460d9b85c130e8021b;p=deliverable%2Flinux.git

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
---

c1ece76719205690f4b448460d9b85c130e8021b
diff --cc Documentation/DocBook/Makefile
index 8e6dd4b14314,2bfd664b5e35..c481df33ef21
--- a/Documentation/DocBook/Makefile
+++ b/Documentation/DocBook/Makefile
@@@ -16,11 -16,9 +16,9 @@@ DOCBOOKS := z8530book.xml device-driver
  	    genericirq.xml s390-drivers.xml uio-howto.xml scsi.xml \
  	    80211.xml debugobjects.xml sh.xml regulator.xml \
  	    alsa-driver-api.xml writing-an-alsa-driver.xml \
- 	    tracepoint.xml media_api.xml w1.xml \
 -	    tracepoint.xml gpu.xml w1.xml \
++	    tracepoint.xml w1.xml \
  	    writing_musb_glue_layer.xml crypto-API.xml iio.xml
  
- include Documentation/DocBook/media/Makefile
- 
  ###
  # The build process is as follows (targets):
  #              (xmldocs) [by docproc]