]> git.baikalelectronics.ru Git - kernel.git/commit
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)
commitdd9f7724ee0f8a0590a8f680827bff6194123749
treebf29c4d30499af0c694ed14ec9a7a5c16a31a887
parentfcbfbc08b5b658a0053df514b905f9aee11744d8
parentd1f711756c3911bc8d80e861eb2cb0212b4531d2
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>