Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Tue, 26 Dec 2017 23:58:57 +0000 (09:58 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 26 Dec 2017 23:58:57 +0000 (09:58 +1000)
one nouveau regression fix

* 'linux-4.15' of git://github.com/skeggsb/linux:
  drm/nouveau: fix race when adding delayed work items


Trivial merge