]> git.baikalelectronics.ru Git - kernel.git/commit
Merge drm-fixes-for-v4.17-rc6-urgent into drm-next
authorDave Airlie <airlied@redhat.com>
Fri, 18 May 2018 04:08:53 +0000 (14:08 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 18 May 2018 04:08:53 +0000 (14:08 +1000)
commite3be5ac56d0f233de9caf98066ff0fb756ecd41c
treef829e8a26fc768666eb5f827bf5817892ea7e46c
parenteffe45781cd1ba72f8e4fbd145323c0690191d1f
parent8c010cb82ec2baaeac2ca90d2cebc3fb12ee84d4
Merge drm-fixes-for-v4.17-rc6-urgent into drm-next

Need to backmerge some nouveau fixes to reduce
the nouveau -next conflicts a lot.

Signed-off-by: Dave Airlie <airlied@redhat.com>
MAINTAINERS
drivers/gpu/drm/amd/display/modules/color/color_gamma.c
drivers/gpu/drm/bridge/Kconfig
drivers/gpu/drm/drm_atomic.c
drivers/gpu/drm/vc4/vc4_plane.c