Merge tag 'v4.11-rc7' into drm-next
authorDave Airlie <airlied@redhat.com>
Wed, 19 Apr 2017 01:07:14 +0000 (11:07 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 19 Apr 2017 01:07:14 +0000 (11:07 +1000)
commit856ee92e8602bd86d34388ac08381c5cb3918756
treec3bed2bf85214f78239724adb34a1c2d6ec8444d
parenta6a5c983b35e579071370d4eb2b4ed8ad5c18da9
parent4f7d029b9bf009fbee76bb10c0c4351a1870d2f3
Merge tag 'v4.11-rc7' into drm-next

Backmerge Linux 4.11-rc7 from Linus tree, to fix some
conflicts that were causing problems with the rerere cache
in drm-tip.
MAINTAINERS
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
drivers/gpu/drm/i915/gvt/execlist.c
drivers/gpu/drm/i915/gvt/gvt.c
drivers/gpu/drm/i915/gvt/gvt.h
drivers/gpu/drm/i915/gvt/kvmgt.c
drivers/gpu/drm/i915/gvt/vgpu.c
drivers/gpu/drm/i915/i915_drv.c
drivers/gpu/drm/i915/i915_gem.c
drivers/gpu/drm/i915/i915_gem_shrinker.c