| commit | e62961262141bd94341ae0dcb75d16a38542cc99 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Fri May 19 10:21:41 2017 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Fri May 19 10:21:41 2017 +1000 |
| tree | d7157e901bf6c51f7b68dfbcb0836f5f55043968 | |
| parent | 6de92ab875c201553a7c48e131d99fc78406a197 [diff] | |
| parent | 2579b8b0ece53248b815042f8662a4531acf120d [diff] |
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