]> git.baikalelectronics.ru Git - kernel.git/commit
Merge branch 'topic/atomic-conversion' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 15 Jun 2015 15:43:48 +0000 (17:43 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Mon, 15 Jun 2015 15:43:48 +0000 (17:43 +0200)
commitda92c18b18492cb5211b3a06ee99b01d3b96e420
treec81768b6287397efe9b13fb80bad06ac9513d7da
parentb1373413bef8ff2b09e4b1b7e923a3e226f9e12a
parent037f5c0536a1d2c62a3d29c407bf1ffb984c29a5
Merge branch 'topic/atomic-conversion' into drm-intel-next-queued

The i915 atomic conversion is a real beast and it's not getting easier
wrangling in a separate branch. I'm might be regretting this, but
right after vacation nothing can burst my little bubble here!

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