From: Dave Airlie <airlied@redhat.com>
Date: Wed, 28 Sep 2016 00:23:50 +0000 (+1000)
Subject: Merge branch 'linux-4.8' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Url: http://git.efficios.com/?a=commitdiff_plain;h=aaee1d1e2d97e3cb99cf0e096d2172237d762e4e;p=deliverable%2Flinux.git

Merge branch 'linux-4.8' of git://github.com/skeggsb/linux into drm-fixes

nouveau: couple of fixes.

* 'linux-4.8' of git://github.com/skeggsb/linux:
  drm/nouveau: Revert "bus: remove cpu_coherent flag"
  drm/nouveau/fifo/nv04: avoid ramht race against cookie insertion
---

aaee1d1e2d97e3cb99cf0e096d2172237d762e4e