Merge drm/drm-next into drm-misc-next
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Mon, 6 Jan 2020 09:35:33 +0000 (10:35 +0100)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Mon, 6 Jan 2020 09:35:33 +0000 (10:35 +0100)
Requested, and we need v5.5-rc1 backported as our current branch is still based on v5.4.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
1  2 
Documentation/devicetree/bindings/vendor-prefixes.yaml
drivers/video/fbdev/core/fbmem.c

Simple merge