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)
commite62961262141bd94341ae0dcb75d16a38542cc99
treed7157e901bf6c51f7b68dfbcb0836f5f55043968
parent6de92ab875c201553a7c48e131d99fc78406a197
parent2579b8b0ece53248b815042f8662a4531acf120d
Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-fixes

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