]> 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)
commitdf6ca27021e871c571a884792c89fb2487c7144f
treec3bed2bf85214f78239724adb34a1c2d6ec8444d
parent16c9b8514dd0e6b0f9528e52e38bc54bac2cb182
parent5f0766d3a7dd914034557335b16e0f9debd5769b
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