]> git.baikalelectronics.ru Git - kernel.git/commit
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next
authorMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Wed, 19 Jun 2019 10:32:13 +0000 (12:32 +0200)
committerMaarten Lankhorst <maarten.lankhorst@linux.intel.com>
Wed, 19 Jun 2019 10:32:13 +0000 (12:32 +0200)
commitac0503e942742fb66c3d5433e705a5e28372ed1e
tree9d889b14957c0e266697d0674675bc42b0899571
parent4f947ab68ae0aca1b7bb662daac6badd622b3eef
parentd9e4fddb98ab80e3c5ceee9e1027226f9c15b305
Merge remote-tracking branch 'drm/drm-next' into drm-misc-next

remove-fbcon-notifiers topic branch is based on rc4, so we need a fresh
backmerge of drm-next to pull it in.

Signed-off-by: Maarten Lankhorst <maarten.lankhorst@linux.intel.com>
drivers/gpu/drm/rockchip/cdn-dp-reg.c
drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c
drivers/gpu/drm/rockchip/rockchip_drm_vop.c