Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-fixes
authorDave Airlie <airlied@redhat.com>
Tue, 6 Jun 2017 06:10:16 +0000 (16:10 +1000)
committerDave Airlie <airlied@redhat.com>
Tue, 6 Jun 2017 06:10:16 +0000 (16:10 +1000)
commit1f779cd74507d7cc3ea16087163f0509e74ef022
treeee679f9c61600dbea1feff0514fdc33d001a2648
parent3c2993b8c6143d8a5793746a54eba8f86f95240f
parentb4e382ca7586a63b6c1e5221ce0863ff867c2df6
Merge branch 'linux-4.12' of git://github.com/skeggsb/linux into drm-fixes

4 nouveau regression fixes.

* 'linux-4.12' of git://github.com/skeggsb/linux:
  drm/nouveau/tmr: fully separate alarm execution/pending lists
  drm/nouveau: enable autosuspend only when it'll actually be used
  drm/nouveau: replace multiple open-coded runpm support checks with function
  drm/nouveau/kms/nv50: add null check before pointer dereference