Merge tag 'topic/drm-misc-2015-07-28' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 6 Aug 2015 12:27:09 +0000 (14:27 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 6 Aug 2015 12:27:09 +0000 (14:27 +0200)
commit7ce723bfe60830fdb7d74cfb4a6ad2b4f0645844
tree47431df1c04c02dfb7ecea479321142c56ad17cc
parentccae35f95cb08e096f12599f7982c24a3d295ee9
parent424b4e0710f3c0d4385be5792cee3a839bafcd13
Merge tag 'topic/drm-misc-2015-07-28' into drm-intel-next-queued

We need a few core drm patches to be able to merge Maarten's series to
convert DPMS over to atomic.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Documentation/DocBook/drm.tmpl
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h
drivers/gpu/drm/i915/intel_pm.c