Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Wed, 15 Jun 2016 06:58:32 +0000 (16:58 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 15 Jun 2016 06:58:32 +0000 (16:58 +1000)
commite43fc9467e96bbaf1b65bb975e6820e0db993469
treec0b77745c92adafdf28ab9ea7d0d9a871e17372a
parentfd2d2bac6e79b0be91ab86a6075a0c46ffda658a
parent6aa85f1129b32b5cd19ec262e7cfc2ddc08263c3
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"