Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thu, 29 Nov 2018 15:12:27 +0000 (16:12 +0100)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Thu, 29 Nov 2018 15:12:50 +0000 (16:12 +0100)
Requested by Boris Brezillon for some vc4 fixes that are needed for future vc4 work.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
1  2 
drivers/gpu/drm/virtio/virtgpu_drv.h

Simple merge