]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commita9c47bf1ee4498ea8b8a6c59f6581edb3d4f3e6a
tree47431df1c04c02dfb7ecea479321142c56ad17cc
parent9a8450beb42e1a8d7debe92b534aa539177afe45
parentad9831b5f26a614c555e133161bfcf189546d06a
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