| commit | 1f779cd74507d7cc3ea16087163f0509e74ef022 | [log] [tgz] |
|---|---|---|
| author | Dave Airlie <airlied@redhat.com> | Tue Jun 06 16:10:16 2017 +1000 |
| committer | Dave Airlie <airlied@redhat.com> | Tue Jun 06 16:10:16 2017 +1000 |
| tree | ee679f9c61600dbea1feff0514fdc33d001a2648 | |
| parent | 3c2993b8c6143d8a5793746a54eba8f86f95240f [diff] | |
| parent | b4e382ca7586a63b6c1e5221ce0863ff867c2df6 [diff] |
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