From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Mon, 15 Jun 2015 15:43:48 +0000 (+0200)
Subject: Merge branch 'topic/atomic-conversion' into drm-intel-next-queued
X-Git-Tag: v4.3-rc1~75^2~36^2~284
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=a80c69fc08064942ba5038310cd63c42b1d8ed72;p=thirdparty%2Flinux.git

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>
---

a80c69fc08064942ba5038310cd63c42b1d8ed72