Merge tag 'doc-4.11-images' of git://git.lwn.net/linux into drm-misc-next
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 14 Mar 2017 14:07:33 +0000 (15:07 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Tue, 14 Mar 2017 14:07:33 +0000 (15:07 +0100)
commitb70366e5d31788650b2a5cec5cd13ea80ac7e44a
treed972ffd190111d699200448494fda333d28b2486
parentf42e181935d5e5670c87d31ae48063a495bbacae
parentdb6ccf23e8ba40fc2e8914ec9c0eb950df71d9fe
Merge tag 'doc-4.11-images' of git://git.lwn.net/linux into drm-misc-next

Pointer for Markus's image conversion work.

We need this so we can merge all the pretty drm graphs for 4.12.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
24 files changed:
Documentation/devicetree/bindings/vendor-prefixes.txt
MAINTAINERS
drivers/dma-buf/dma-fence.c
drivers/gpu/drm/drm_gem_cma_helper.c
drivers/gpu/drm/drm_mode_object.c
drivers/gpu/drm/drm_probe_helper.c
drivers/gpu/drm/gma500/framebuffer.c
drivers/gpu/drm/gma500/psb_drv.h
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/i915_irq.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/msm/msm_drv.h
drivers/gpu/drm/omapdrm/omap_drv.h
drivers/gpu/drm/omapdrm/omap_gem.c
drivers/gpu/drm/rockchip/cdn-dp-core.c
drivers/gpu/drm/tinydrm/mipi-dbi.c
drivers/gpu/drm/ttm/ttm_bo.c
drivers/gpu/drm/vc4/vc4_gem.c
drivers/gpu/drm/vgem/vgem_drv.c
drivers/of/platform.c
include/drm/drm_edid.h
include/drm/drm_framebuffer.h
include/drm/drm_mm.h