tree c81768b6287397efe9b13fb80bad06ac9513d7da
parent 49e4d842f0d0892c3d26c93a81b9f22c1467030e
parent c0165304e10f317672e20f2b40770d74c51e287f
author Daniel Vetter <daniel.vetter@ffwll.ch> 1434383028 +0200
committer Daniel Vetter <daniel.vetter@ffwll.ch> 1434383028 +0200

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>