tree 48ec31db7a09a0e6b7cca66ea08b20cc78f218cb
parent e8fcdf1e65c71340972041295fb7b3e59929b761
parent 99ee87295017e36abb6925e6139ca303cb55aee7
author Daniel Vetter <daniel.vetter@ffwll.ch> 1463480149 +0200
committer Daniel Vetter <daniel.vetter@ffwll.ch> 1463480149 +0200

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

Backmerge request by Jani to get at

commit 249c4f538b1aae55d41699f8bafc6cb762a7f48f
Author: Deepak M <m.deepak@intel.com>
Date:   Wed Mar 30 17:03:39 2016 +0300

    drm: Add new DCS commands in the enum list

Some simple conflicts in intel_dp.c.

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