Merge tag 'vmwgfx-fixes-4.4-151208' of git://people.freedesktop.org/~thomash/linux...
authorDave Airlie <airlied@redhat.com>
Wed, 9 Dec 2015 04:16:53 +0000 (14:16 +1000)
committerDave Airlie <airlied@redhat.com>
Wed, 9 Dec 2015 04:16:53 +0000 (14:16 +1000)
commit1a6e76017bd652f1e90eafba01ca8fced770b6d1
tree911dab66e96b92904b807d63a57e1bd507050bc7
parentff6e0fd55ef24e62efe5c9ab8327312164554250
parent8fbf9d92a7bc4cadd3a0139698cf17031dfcdfca
Merge tag 'vmwgfx-fixes-4.4-151208' of git://people.freedesktop.org/~thomash/linux into drm-fixes

Pull request of 2015-12-08

A couple of fixes for vmwgfx. A WARN() fix by Dan Carpenter,
a TTM read/write lock imbalance causing occasional hangs with Wayland and
an implementation of cursor_set2 to fix incorrectly offset Wayland cursors.

* tag 'vmwgfx-fixes-4.4-151208' of git://people.freedesktop.org/~thomash/linux:
  drm/vmwgfx: Implement the cursor_set2 callback v2
  drm/vmwgfx: fix a warning message
  drm/ttm: Fixed a read/write lock imbalance