]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdb9d79a238bb46ca81d01607197dc2625633b51f
treec3bed2bf85214f78239724adb34a1c2d6ec8444d
parent72a7757d479c785297aa87663301256f46fb9a27
parent4a46f7ef1255fece6f2525bf6b6c51a29186e498
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