Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Mon, 17 Jun 2019 08:17:38 +0000 (10:17 +0200)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Mon, 17 Jun 2019 08:17:38 +0000 (10:17 +0200)
Pick up rc3 and rc4 and the merges from the other branches,
we're a bit out of date.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>

Trivial merge