diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-28 13:22:26 -0700 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2017-06-28 13:22:26 -0700 |
commit | 5a37be4b51bbf85e37cdb5831899c330505faf03 (patch) | |
tree | 24ec48d353a9c6f1169f454357c7fdd59a0b2ca1 /fs | |
parent | cf723497f2b0dfd688dd27949f1d6e26a5aec44c (diff) | |
parent | 9ff1beb1d19ffe2b26bf9cd2d33e6073d4f4b5fe (diff) | |
download | op-kernel-dev-5a37be4b51bbf85e37cdb5831899c330505faf03.zip op-kernel-dev-5a37be4b51bbf85e37cdb5831899c330505faf03.tar.gz |
Merge branch 'drm-fixes' of git://people.freedesktop.org/~airlied/linux
Pull drm fixes from Dave Airlie:
"This is the final set of fixes for -rc8, just a few i915 and one
vmwgfx ones.
I'm off on holidays for a week, so if anything shows up for fixes I've
asked Daniel or Sean Paul to herd it in the right direction"
[ The additional etnaviv fixes were already herded towards me as seen in
my previous pull - Linus ]
* 'drm-fixes' of git://people.freedesktop.org/~airlied/linux:
drm/vmwgfx: Free hash table allocated by cmdbuf managed res mgr
drm/i915: Disable EXEC_OBJECT_ASYNC when doing relocations
drm/i915: Hold struct_mutex for per-file stats in debugfs/i915_gem_object
drm/i915: Retire the VMA's fence tracker before unbinding
Diffstat (limited to 'fs')
0 files changed, 0 insertions, 0 deletions