From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Thu, 16 Jun 2016 12:18:30 +0000 (+0200)
Subject: Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=c19941218c9a1cae578dfbf30190b13b9cdb9aa8;p=linux.git

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Backmerge drm-next to get at the nonblocking atomic helpers, needed to
merge the i915 conversion.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
---

c19941218c9a1cae578dfbf30190b13b9cdb9aa8