linux/Documentation/DocBook/media
Mauro Carvalho Chehab a32f7d1ad3 Merge branch 'v4l_for_linus' into staging/for_v3.9
* v4l_for_linus: (464 commits)
  [media] uvcvideo: Set error_idx properly for S_EXT_CTRLS failures
  [media] uvcvideo: Cleanup leftovers of partial revert
  [media] uvcvideo: Return -EACCES when trying to set a read-only control
  Linux 3.8-rc3
  mm: reinstante dropped pmd_trans_splitting() check
  cred: Remove tgcred pointer from struct cred
  drm/ttm: fix fence locking in ttm_buffer_object_transfer
  ARM: clps711x: Fix bad merge of clockevents setup
  ARM: highbank: save and restore L2 cache and GIC on suspend
  ARM: highbank: add a power request clear
  ARM: highbank: fix secondary boot and hotplug
  ARM: highbank: fix typos with hignbank in power request functions
  ARM: dts: fix highbank cpu mpidr values
  ARM: dts: add device_type prop to cpu nodes on Calxeda platforms
  drm/prime: drop reference on imported dma-buf come from gem
  xen/netfront: improve truesize tracking
  ARM: mx5: Fix MX53 flexcan2 clock
  ARM: OMAP2+: am33xx-hwmod: Fix wrongly terminated am33xx_usbss_mpu_irqs array
  sctp: fix Kconfig bug in default cookie hmac selection
  EDAC: Cleanup device deregistering path
  ...

Conflicts:
	drivers/media/pci/dm1105/dm1105.c
	drivers/media/platform/soc_camera/mx2_camera.c
2013-01-24 18:49:18 -02:00
..
dvb [media] dvb: Add DVBv5 statistics properties 2013-01-23 19:06:33 -02:00
v4l Merge branch 'v4l_for_linus' into staging/for_v3.9 2013-01-24 18:49:18 -02:00
Makefile DocBook/media/Makefile: Fix build due to uapi breakage 2012-10-17 10:06:33 -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