From: Daniel Vetter Date: Mon, 15 Jun 2015 15:43:48 +0000 (+0200) Subject: Merge branch 'topic/atomic-conversion' into drm-intel-next-queued X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=a80c69fc08064942ba5038310cd63c42b1d8ed72;p=linux-beck.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 --- a80c69fc08064942ba5038310cd63c42b1d8ed72