linux/Documentation/DocBook/media
Mauro Carvalho Chehab 64131a87f2 Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus
* 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux: (9717 commits)
  media-bus: Fixup RGB444_1X12, RGB565_1X16, and YUV8_1X24 media bus format
  hexdump: avoid warning in test function
  fs: take i_mutex during prepare_binprm for set[ug]id executables
  smp: Fix error case handling in smp_call_function_*()
  iommu-common: Fix PARISC compile-time warnings
  sparc: Make LDC use common iommu poll management functions
  sparc: Make sparc64 use scalable lib/iommu-common.c functions
  Break up monolithic iommu table/lock into finer graularity pools and lock
  sparc: Revert generic IOMMU allocator.
  tools/power turbostat: correct dumped pkg-cstate-limit value
  tools/power turbostat: calculate TSC frequency from CPUID(0x15) on SKL
  tools/power turbostat: correct DRAM RAPL units on recent Xeon processors
  tools/power turbostat: Initial Skylake support
  tools/power turbostat: Use $(CURDIR) instead of $(PWD) and add support for O= option in Makefile
  tools/power turbostat: modprobe msr, if needed
  tools/power turbostat: dump MSR_TURBO_RATIO_LIMIT2
  tools/power turbostat: use new MSR_TURBO_RATIO_LIMIT names
  Bluetooth: hidp: Fix regression with older userspace and flags validation
  config: Enable NEED_DMA_MAP_STATE by default when SWIOTLB is selected
  perf/x86/intel/pt: Fix and clean up error handling in pt_event_add()
  ...

That solves several merge conflicts:
	Documentation/DocBook/media/v4l/subdev-formats.xml
	Documentation/devicetree/bindings/vendor-prefixes.txt
	drivers/staging/media/mn88473/mn88473.c
	include/linux/kconfig.h
	include/uapi/linux/media-bus-format.h

The ones at subdev-formats.xml and media-bus-format.h are not trivial.
That's why we opted to merge from DRM.
2015-04-21 09:44:55 -03:00
..
dvb [media] Documentation: FE_SET_PROPERTY requires R/W 2014-10-30 09:06:23 -02:00
v4l Merge branch 'drm-next-merged' of git://people.freedesktop.org/~airlied/linux into v4l_for_linus 2015-04-21 09:44:55 -03:00
Makefile DocBook: Reduce noise from make cleandocs 2014-10-22 11:50:30 -04: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