| commit | c276be4f38dfef1968400939aa2e33602d0a7156 | [log] [tgz] |
|---|---|---|
| author | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Mar 29 09:20:33 2017 +0200 |
| committer | Daniel Vetter <daniel.vetter@ffwll.ch> | Wed Mar 29 09:20:33 2017 +0200 |
| tree | bf29c4d30499af0c694ed14ec9a7a5c16a31a887 | |
| parent | 9a86cda07af2c63649932f0a4fc757701ef54c42 [diff] | |
| parent | 8bcad07a45637fb88e799466e4eee83859e8ffd3 [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>