Merge branch 'linux-4.13' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Thu, 10 Aug 2017 01:45:04 +0000 (11:45 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 10 Aug 2017 01:45:04 +0000 (11:45 +1000)
single nouveau regression fix.

* 'linux-4.13' of git://github.com/skeggsb/linux:
  drm/nouveau/disp/nv04: avoid creation of output paths


Trivial merge