Merge tag 'topic/drm-misc-2016-02-12' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 12 Feb 2016 13:24:37 +0000 (14:24 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 12 Feb 2016 13:24:37 +0000 (14:24 +0100)
commit05fd934ba585ea8c9f129f15f11327adb1f96fe3
tree7b678c512c43419ccf484e71c84d69caee84a6da
parentebb7c78d358b2ea45c7d997423e6feb42e5ce4ef
parent382ab95d1af85381d8a5dff09b16a80c7e492534
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>
drivers/gpu/drm/i915/i915_dma.c
drivers/gpu/drm/i915/intel_display.c
drivers/gpu/drm/i915/intel_drv.h