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)
* '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"


Trivial merge