]> git.proxmox.com Git - mirror_ubuntu-kernels.git/commitdiff
Merge branch 'vmwgfx-fixes-3.19' of git://people.freedesktop.org/~thomash/linux into...
authorDave Airlie <airlied@redhat.com>
Thu, 22 Jan 2015 00:03:00 +0000 (10:03 +1000)
committerDave Airlie <airlied@redhat.com>
Thu, 22 Jan 2015 00:03:00 +0000 (10:03 +1000)
fix a vmwgfx regression sleeping wrong task state.

* 'vmwgfx-fixes-3.19' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Replace the hw mutex with a hw spinlock


Trivial merge