From: Dave Airlie <airlied@redhat.com>
Date: Wed, 15 Jun 2016 06:58:32 +0000 (+1000)
Subject: Merge branch 'linux-4.7' of git://github.com/skeggsb/linux into drm-fixes
X-Git-Tag: v4.7-rc4~21^2~2
X-Git-Url: https://git.kernel.dk/?a=commitdiff_plain;h=e43fc9467e96bbaf1b65bb975e6820e0db993469;p=linux-2.6-block.git

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"
---

e43fc9467e96bbaf1b65bb975e6820e0db993469