| commit | aaee1d1e2d97e3cb99cf0e096d2172237d762e4e | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Wed Sep 28 10:23:50 2016 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Wed Sep 28 10:23:50 2016 +1000 |
| tree | b157e95fcba896ec4c6b4e73322bb9e8ab32fb94 | |
| parent | b86f9faa34b4f08f4fbca333648d999bfcf42192 [diff] | |
| parent | bad3d80fd001d3b74ab8bb3d561bc4d1b08797d3 [diff] |
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