projects
/
platform
/
kernel
/
linux-rpi.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
a6a5c98
4f7d029
)
Merge tag 'v4.11-rc7' into drm-next
author
Dave Airlie
<airlied@redhat.com>
Wed, 19 Apr 2017 01:07:14 +0000
(11:07 +1000)
committer
Dave Airlie
<airlied@redhat.com>
Wed, 19 Apr 2017 01:07:14 +0000
(11:07 +1000)
Backmerge Linux 4.11-rc7 from Linus tree, to fix some
conflicts that were causing problems with the rerere cache
in drm-tip.
1
2
MAINTAINERS
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/gvt/execlist.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/gvt/gvt.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/gvt/gvt.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/gvt/kvmgt.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/gvt/vgpu.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_drv.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_gem.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_gem_shrinker.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
MAINTAINERS
Simple merge
diff --cc
drivers/gpu/drm/etnaviv/etnaviv_gpu.c
Simple merge
diff --cc
drivers/gpu/drm/i915/gvt/execlist.c
Simple merge
diff --cc
drivers/gpu/drm/i915/gvt/gvt.c
Simple merge
diff --cc
drivers/gpu/drm/i915/gvt/gvt.h
Simple merge
diff --cc
drivers/gpu/drm/i915/gvt/kvmgt.c
Simple merge
diff --cc
drivers/gpu/drm/i915/gvt/vgpu.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_drv.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_gem.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_gem_shrinker.c
Simple merge