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)
commitaaee1d1e2d97e3cb99cf0e096d2172237d762e4e
treeb157e95fcba896ec4c6b4e73322bb9e8ab32fb94
parentb86f9faa34b4f08f4fbca333648d999bfcf42192
parentbad3d80fd001d3b74ab8bb3d561bc4d1b08797d3
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