]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge tag 'drm-intel-fixes-2016-12-01' of git://anongit.freedesktop.org/git/drm-intel...
authorDave Airlie <airlied@redhat.com>
Sat, 3 Dec 2016 20:31:26 +0000 (06:31 +1000)
committerDave Airlie <airlied@redhat.com>
Sat, 3 Dec 2016 20:31:26 +0000 (06:31 +1000)
2 intel fixes.

* tag 'drm-intel-fixes-2016-12-01' of git://anongit.freedesktop.org/git/drm-intel:
  drm/i915: drop the struct_mutex when wedged or trying to reset
  drm/i915: Don't touch NULL sg on i915_gem_object_get_pages_gtt() error


Trivial merge