Merge branch 'linux-4.18' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Wed, 20 Jun 2018 06:57:03 +0000 (16:57 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 20 Jun 2018 06:57:09 +0000 (16:57 +1000)
Single nouveau regression fix.

Signed-off-by: Dave Airlie <airlied@redhat.com>
Link: https://patchwork.freedesktop.org/patch/msgid/CACAvsv5VDDKaYKJShyVAGK0MJAHMZOJ02FKQ_aW5DnBCNVgRUw@mail.gmail.com

Trivial merge