From: Jani Nikula <jani.nikula@intel.com>
Date: Mon, 4 Sep 2017 18:40:34 +0000 (+0300)
Subject: Merge drm-upstream/drm-next into drm-intel-next-queued
X-Git-Tag: v4.15-rc1~19^2~57^2~13
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=d149d6ae17197ce23e2cd6bc5fcdacf7b593e55e;p=linux-2.6-block.git

Merge drm-upstream/drm-next into drm-intel-next-queued

Catch up with upstream while it's easy.

Signed-off-by: Jani Nikula <jani.nikula@intel.com>
---

d149d6ae17197ce23e2cd6bc5fcdacf7b593e55e