OSDN Git Service
(root)
/
uclinux-h8
/
linux.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
7800fb6
0c744ea
)
Merge tag 'v4.10-rc2' into drm-intel-next-queued
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Wed, 4 Jan 2017 10:34:01 +0000
(11:34 +0100)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Wed, 4 Jan 2017 10:35:18 +0000
(11:35 +0100)
Backmerge Linux 4.10-rc2 to resync with our -fixes cherry-picks. I've
done the backmerge directly because Dave is on vacation.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
1
2
drivers/gpu/drm/i915/gvt/scheduler.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_gem.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_gem_request.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/i915_gem_userptr.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_dsi.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_uncore.c
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/i915/gvt/scheduler.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_gem.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_gem_request.c
Simple merge
diff --cc
drivers/gpu/drm/i915/i915_gem_userptr.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_dsi.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_uncore.c
Simple merge