commit | e43fc9467e96bbaf1b65bb975e6820e0db993469 | [log] [tgz] |
---|---|---|
author | Dave Airlie <airlied@redhat.com> | Wed Jun 15 16:58:32 2016 +1000 |
committer | Dave Airlie <airlied@redhat.com> | Wed Jun 15 16:58:32 2016 +1000 |
tree | c0b77745c92adafdf28ab9ea7d0d9a871e17372a | |
parent | fd2d2bac6e79b0be91ab86a6075a0c46ffda658a [diff] | |
parent | 6aa85f1129b32b5cd19ec262e7cfc2ddc08263c3 [diff] |
Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes * 'linux-4.7' of git://github.com/skeggsb/linux: drm/nouveau/iccsense: fix memory leak drm/nouveau/Revert "drm/nouveau/device/pci: set as non-CPU-coherent on ARM64"