Merge branch 'drm-misc-next-fixes' into drm-misc-fixes
authorSean Paul <seanpaul@chromium.org>
Mon, 17 Jul 2017 15:43:05 +0000 (11:43 -0400)
committerSean Paul <seanpaul@chromium.org>
Mon, 17 Jul 2017 15:56:07 +0000 (11:56 -0400)
Pick up

1ed134e6526b drm/vc4: Fix VBLANK handling in crtc->enable() path

From drm-misc-next-fixes, it was applied after the last pull request
was sent from that branch. We'll send it through drm-fixes instead.

1  2 
drivers/dma-buf/dma-fence.c
drivers/dma-buf/sync_debug.c
drivers/dma-buf/sync_file.c

Simple merge
Simple merge
Simple merge