Merge drm/drm-next into drm-intel-next-queued
authorJani Nikula <jani.nikula@intel.com>
Fri, 2 Nov 2018 07:00:55 +0000 (09:00 +0200)
committerJani Nikula <jani.nikula@intel.com>
Fri, 2 Nov 2018 07:01:28 +0000 (09:01 +0200)
Although there's nothing crucial missing, it's been a long time since
the last backmerge. Catch up with drm-next.

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

Trivial merge