]> git.baikalelectronics.ru Git - kernel.git/commit
Merge v4.18-rc3 into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 4 Jul 2018 00:27:12 +0000 (10:27 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 4 Jul 2018 00:27:12 +0000 (10:27 +1000)
commit177cae93b91d54026a384d00081617733f1ec83e
treee72d49a2f677dd069c3a673522cf785548148f71
parent9d9aa87041eace7cd2ec884dcf3d8b86e064205f
parentbd594001da828129ed149628b7cd368061398a51
Merge v4.18-rc3 into drm-next

Two requests have come in for a backmerge,
and I've got some pull reqs on rc2, so this
just makes sense.

Signed-off-by: Dave Airlie <airlied@redhat.com>
drivers/gpu/drm/amd/amdgpu/amdgpu_device.c
drivers/gpu/drm/amd/amdgpu/amdgpu_object.c
drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c
drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c
drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c
drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c
drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c
drivers/gpu/drm/i915/i915_drv.h
drivers/gpu/drm/sun4i/sun4i_tcon.c