Merge branch 'linux-4.8' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Wed, 28 Sep 2016 00:23:50 +0000 (10:23 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 28 Sep 2016 00:23:50 +0000 (10:23 +1000)
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


Trivial merge