projects
/
openwrt
/
staging
/
blogic.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
combined
(merge:
9a86cda
8bcad07
)
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
author
Daniel Vetter
<daniel.vetter@ffwll.ch>
Wed, 29 Mar 2017 07:20:33 +0000
(09:20 +0200)
committer
Daniel Vetter
<daniel.vetter@ffwll.ch>
Wed, 29 Mar 2017 07:20:33 +0000
(09:20 +0200)
Backmerge drm-next one more because Dave fumbled the conflict
resolution slightly and I didn't notice it. We need Zhenyu's hotfix
before he can assemble the gvt pull ...
Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>
Trivial merge
projects / openwrt / staging / blogic.git / commitdiff