OSDN Git Service

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)
commitbcb7416e3480c1abb46266bdab874b3b3d6124cb
tree9d889b14957c0e266697d0674675bc42b0899571
parent90b2df5743cd92f4525f662e8f12a536dfb58557
parent52d2d44eee8091e740d0d275df1311fb8373c9a9
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