]> 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)
commit79faea60a3c31c687f2d2dd97b54f5c1b2e937c7
treebf29c4d30499af0c694ed14ec9a7a5c16a31a887
parentd77cbc6f33448477c1739f1cdf9de281ca3f3522
parent6d71807cba548261199c7543b5e9fcf682ea0385
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>