projects / GitHub / MotorolaMobilityLLC / kernel-slsi.git / commit
? search:
summary | shortlog | log | commit | commitdiff | tree
(merge: 9a86cda 8bcad07)
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 29 Mar 2017 07:20:33 +0000 (09:20 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Wed, 29 Mar 2017 07:20:33 +0000 (09:20 +0200)
commitc276be4f38dfef1968400939aa2e33602d0a7156
treebf29c4d30499af0c694ed14ec9a7a5c16a31a887tree | snapshot (tar.gz zip)
parent9a86cda07af2c63649932f0a4fc757701ef54c42commit | diff
parent8bcad07a45637fb88e799466e4eee83859e8ffd3commit | diff
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

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>
Motorola kernel-slsi