Backmerge tag 'v4.12-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Mon, 26 Jun 2017 21:24:49 +0000 (07:24 +1000)
committerDave Airlie <airlied@redhat.com>
Mon, 26 Jun 2017 22:28:30 +0000 (08:28 +1000)
Linux 4.12-rc7

Needed at least rc6 for drm-misc-next-fixes, may as well go to rc7

1  2 
drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c
drivers/gpu/drm/amd/amdgpu/dce_v10_0.c
drivers/gpu/drm/amd/amdgpu/dce_v11_0.c
drivers/gpu/drm/amd/amdgpu/dce_v6_0.c
drivers/gpu/drm/amd/amdgpu/dce_v8_0.c
drivers/gpu/drm/drm_connector.c
drivers/gpu/drm/radeon/cik.c
drivers/gpu/drm/radeon/evergreen.c
drivers/gpu/drm/radeon/si.c
drivers/gpu/drm/tegra/drm.c
drivers/gpu/host1x/dev.c

Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge
Simple merge