Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Tue, 9 Jan 2018 02:03:10 +0000 (12:03 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 9 Jan 2018 02:03:10 +0000 (12:03 +1000)
nouveau displayport regression fix.

* 'linux-4.15' of git://github.com/skeggsb/linux:
  drm/nouveau/disp/gf119: add missing drive vfunc ptr


Trivial merge