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)
commit7a085c3aad94cce7e11031c6800e41668418ae4c
treeb3474f8bd622f87ad39227057f9de60959c8bd95
parent18cde299df33ff73908f7e5dcebf321fb79ed36c
parentf9885ef875e9160454392f85159163674159c51f
Merge drm/drm-next into drm-intel-next-queued

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>