Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Fri, 19 May 2017 00:21:41 +0000 (10:21 +1000)
committerDave Airlie <airlied@redhat.com>
Fri, 19 May 2017 00:21:41 +0000 (10:21 +1000)
misc nouveau fixes.

* 'linux-4.12' of git://github.com/skeggsb/linux:
  drm/nouveau/fifo/gk104-: Silence a locking warning
  drm/nouveau/secboot: plug memory leak in ls_ucode_img_load_gr() error path
  drm/nouveau: Fix drm poll_helper handling


Trivial merge