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)
commite100ff380ce936fc1e7ae8ba16621ddf5dddffcb
tree919fe4d6e28e92f4529a03b95c28b8dc6784c73a
parent464e1d5f23cca236b930ef068c328a64cab78fb1
parentb26a2319be3dd26edb3013504992a037a5902520
Merge branch 'linux-4.15' of git://github.com/skeggsb/linux into drm-fixes

one nouveau regression fix

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