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)
commitb0bb222440a5c8273f67dd37946707e6ba6ad832
tree3dd62fdaf288a80e3a7fbea3928b2baf0bda9d52
parent909ef254ee3bfb305524b6651c2e74c4b330d8df
parent1b5c7ef3d0d0610bda9b63263f7c5b7178d11015
Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes

nouveau displayport regression fix.

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