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)
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>
1  2 
drivers/gpu/drm/i915/i915_debugfs.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/i915/intel_display.c

Simple merge
Simple merge
Simple merge