projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
6d6a897
00fc2c2
)
Merge tag 'drm-for-v4.13' into drm-intel-next-queued
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Mon, 10 Jul 2017 19:56:39 +0000
(21:56 +0200)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Mon, 10 Jul 2017 19:56:39 +0000
(21:56 +0200)
Resync with the main drm-next pull request for 4.13. What we really
need is to fully resync with pending drm-misc, but that's not yet
possible due to the still ongoing merge window.
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
1
2
drivers/gpu/drm/i915/i915_drv.h
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_display.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_dp.c
patch
|
diff1
|
diff2
|
blob
|
history
drivers/gpu/drm/i915/intel_drv.h
patch
|
diff1
|
diff2
|
blob
|
history
diff --cc
drivers/gpu/drm/i915/i915_drv.h
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_display.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_dp.c
Simple merge
diff --cc
drivers/gpu/drm/i915/intel_drv.h
Simple merge