linux/Documentation/DocBook/media
Linus Torvalds aace99e57c Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media
Pull media fixes from Mauro Carvalho Chehab.

Trivial conflict due to new USB HID ID's being added next to each other
(Baanto vs Axentia).

* 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media: (44 commits)
  [media] smia: Fix compile failures
  [media]  Fix VIDIOC_DQEVENT docbook entry
  [media] s5p-fimc: Fix control creation function
  [media] s5p-mfc: Fix checkpatch error in s5p_mfc_shm.h file
  [media] s5p-mfc: Fix setting controls
  [media] v4l/s5p-mfc: added image size align in VIDIOC_TRY_FMT
  [media] v4l/s5p-mfc: corrected encoder v4l control definitions
  [media] v4l: mem2mem_testdev: Fix race conditions in driver
  [media] s5p-mfc: Bug fix of timestamp/timecode copy mechanism
  [media] cxd2820r: Fix an incorrect modulation type bitmask
  [media] em28xx: Show a warning if the board does not support remote controls
  [media] em28xx: Add remote control support for Terratec's Cinergy HTC Stick HD
  [media] USB: Staging: media: lirc: initialize spinlocks before usage
  [media] Revert "[media] media: mx2_camera: Fix mbus format handling"
  [media] bw-qcam: driver and pixfmt documentation fixes
  [media] cx88: fix firmware load on big-endian systems
  [media] cx18: support big-endian systems
  [media] ivtv: fix support for big-endian systems
  [media] tuner-core: return the frequency range of the correct tuner
  [media] v4l2-dev.c: fix g_parm regression in determine_valid_ioctls()
  ...
2012-06-25 14:53:09 -07:00
..
dvb [media] DVB: remove "stats" property bits from ATSC-MH API property additions 2012-05-20 10:06:08 -03:00
v4l Merge branch 'v4l_for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mchehab/linux-media 2012-06-25 14:53:09 -07:00
Makefile [media] v4l: Add subdev selections documentation 2012-04-10 17:11:27 -03:00
bayer.png.b64 [media] DocBook: Use base64 for gif/png files 2011-07-27 17:52:59 -03:00
constraints.png.b64 [media] doc: v4l: add binary images for selection API 2012-01-10 23:17:55 -02:00
crop.gif.b64 [media] DocBook: Use base64 for gif/png files 2011-07-27 17:52:59 -03:00
dvbstb.png.b64 [media] DocBook: Use base64 for gif/png files 2011-07-27 17:52:59 -03:00
fieldseq_bt.gif.b64 [media] DocBook: Use base64 for gif/png files 2011-07-27 17:52:59 -03:00
fieldseq_tb.gif.b64 [media] DocBook: Use base64 for gif/png files 2011-07-27 17:52:59 -03:00
nv12mt.gif.b64 [media] DocBook: Use base64 for gif/png files 2011-07-27 17:52:59 -03:00
nv12mt_example.gif.b64 [media] DocBook: Use base64 for gif/png files 2011-07-27 17:52:59 -03:00
pipeline.png.b64 [media] DocBook: Use base64 for gif/png files 2011-07-27 17:52:59 -03:00
selection.png.b64 [media] doc: v4l: add binary images for selection API 2012-01-10 23:17:55 -02:00
vbi_525.gif.b64 [media] DocBook: Use base64 for gif/png files 2011-07-27 17:52:59 -03:00
vbi_625.gif.b64 [media] DocBook: Use base64 for gif/png files 2011-07-27 17:52:59 -03:00
vbi_hsync.gif.b64 [media] DocBook: Use base64 for gif/png files 2011-07-27 17:52:59 -03:00