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)
commit06059d5090118b047c5b6a621c8b57a068f7ce2c
tree47431df1c04c02dfb7ecea479321142c56ad17cc
parent80aa93128653c5f2502053c0d9740b336d975667
parent8c10342cb48f3140d9abeadcfd2fa6625d447282
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