OSDN Git Service

Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued
authorDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 28 Oct 2016 07:14:08 +0000 (09:14 +0200)
committerDaniel Vetter <daniel.vetter@ffwll.ch>
Fri, 28 Oct 2016 07:14:08 +0000 (09:14 +0200)
commit96583ddbec291929880edefa2141c06c63e16aa5
tree6ae6bd3aec381d7461a687e3314bdf949798c554
parent1353ec3833360ffab479d17781493ead1d38a006
parentfb422950c6cd726fd36eb72a7cf84583440a18a2
Merge remote-tracking branch 'airlied/drm-next' into drm-intel-next-queued

Backmerge latest drm-next to pull in the s/fence/dma_fence/ rework,
needed before we merge more i915 fencing patches.

Signed-off-by: Daniel Vetter <daniel.vetter@intel.com>