diff options
| author | Dave Airlie <airlied@redhat.com> | 2017-02-01 05:28:14 +1000 |
|---|---|---|
| committer | Dave Airlie <airlied@redhat.com> | 2017-02-01 05:28:14 +1000 |
| commit | edc67410449c668434b183bb0f770b7bf456c750 (patch) | |
| tree | 9e75490ab352bf7d2e4a689ee761656d3dafc7d1 /net/key | |
| parent | 566cf877a1fcb6d6dc0126b076aad062054c2637 (diff) | |
| parent | 2b5078937355c0d662ecef54b7d4d04f48da4fa9 (diff) | |
Merge branch 'linux-4.10' of git://github.com/skeggsb/linux into drm-fixes
Just a couple of minor race/regression fixes, nothing exciting, but
somewhat important
* 'linux-4.10' of git://github.com/skeggsb/linux:
drm/nouveau/kms/nv50: request vblank events for commits that send completion events
drm/nouveau/nv1a,nv1f/disp: fix memory clock rate retrieval
drm/nouveau/disp/gt215: Fix HDA ELD handling (thus, HDMI audio) on gt215
drm/nouveau/nouveau/led: prevent compiling the led-code if nouveau=y and leds=m
drm/nouveau/disp/mcp7x: disable dptmds workaround
drm/nouveau: prevent userspace from deleting client object
drm/nouveau/fence/g84-: protect against concurrent access to semaphore buffers
Diffstat (limited to 'net/key')
0 files changed, 0 insertions, 0 deletions