From: Daniel Vetter <daniel.vetter@ffwll.ch>
Date: Fri, 12 Feb 2016 13:24:37 +0000 (+0100)
Subject: Merge tag 'topic/drm-misc-2016-02-12' into drm-intel-next-queued
X-Git-Tag: v4.6-rc1~61^2~26^2~2
X-Git-Url: https://repo.jachan.dev/linux.git/commitdiff_plain/05fd934ba585ea8c9f129f15f11327adb1f96fe3

Merge tag 'topic/drm-misc-2016-02-12' into drm-intel-next-queued

Backmerge to get at the new encoder_mask support in atomic helpers.

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

05fd934ba585ea8c9f129f15f11327adb1f96fe3