Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux into drm-misc...
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 23 Mar 2017 07:15:55 +0000 (08:15 +0100)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Thu, 23 Mar 2017 07:15:55 +0000 (08:15 +0100)
commit628d4c46eef4fabe3ddbe07698577162c1cd5d41
tree5e89f3deafd44c8b81543540c573af0c16dbb427
parent1e797f556c616a42f1e039b1ff1d3c58f61b6104
parent65d1086c44791112188f6aebbdc3a27cab3736d3
Merge branch 'drm-next' of git://people.freedesktop.org/~airlied/linux into drm-misc-next

Resync with drm-next, I have a patch which currently can't be applied
because drm-misc-next lacked the latest drm/i915 code.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
drivers/gpu/drm/drm_fourcc.c
drivers/gpu/drm/i915/intel_dp_mst.c
drivers/gpu/drm/nouveau/nv50_display.c